From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../navigator-window-controls-overlay.html         | 41 -----------------
 ...avigator-window-controls-overlay.tentative.html | 41 +++++++++++++++++
 .../navigator_user_agent.https.html                | 53 ----------------------
 .../navigator_user_agent.https.tentative.html      | 53 ++++++++++++++++++++++
 4 files changed, 94 insertions(+), 94 deletions(-)
 delete mode 100644 testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html
 create mode 100644 testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.tentative.html
 delete mode 100644 testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
 create mode 100644 testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.tentative.html

(limited to 'testing/web-platform/tests/html/webappapis')
diff --git a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html
deleted file mode 100644
index 9cff8d3163..0000000000
--- a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<meta charset='utf-8'>
-<title>navigator.windowControlsOverlay</title>
-
-<script src='/resources/testharness.js'></script>
-<script src='/resources/testharnessreport.js'></script>
-
-<script>
-  test(function(){
-    assert_idl_attribute(navigator, 'windowControlsOverlay');
-  }, 'the windowControlsOverlay object should exist on the navigator object');
-
-  test(function(){
-    assert_idl_attribute(navigator.windowControlsOverlay, 'visible');
-  }, 'visible should be a member of the windowControlsOverlay object');
-
-  test(function(){
-    assert_false(navigator.windowControlsOverlay.visible);
-  }, 'visible should be false');
-
-  test(function(){
-    assert_idl_attribute(navigator.windowControlsOverlay, 'getTitlebarAreaRect');
-  }, 'getTitlebarAreaRect should be a method of the windowControlsOverlay object');
-
-  test(function(){
-    var rect = navigator.windowControlsOverlay.getTitlebarAreaRect();
-    assert_true(rect instanceof DOMRect);
-  }, 'getTitlebarAreaRect return type should be DOMRect');
-
-  test(function(){
-    var rect = navigator.windowControlsOverlay.getTitlebarAreaRect();
-    assert_equals(rect.x, 0);
-    assert_equals(rect.y, 0);
-    assert_equals(rect.width, 0);
-    assert_equals(rect.height, 0);
-  }, 'getTitlebarAreaRect should return a empty DOMRect');
-
-  test(function(){
-    assert_idl_attribute(navigator.windowControlsOverlay, 'ongeometrychange');
-  }, 'ongeometrychange should be a member of the windowControlsOverlay object');
-</script>
diff --git a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.tentative.html b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.tentative.html
new file mode 100644
index 0000000000..9cff8d3163
--- /dev/null
+++ b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>navigator.windowControlsOverlay</title>
+
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<script>
+  test(function(){
+    assert_idl_attribute(navigator, 'windowControlsOverlay');
+  }, 'the windowControlsOverlay object should exist on the navigator object');
+
+  test(function(){
+    assert_idl_attribute(navigator.windowControlsOverlay, 'visible');
+  }, 'visible should be a member of the windowControlsOverlay object');
+
+  test(function(){
+    assert_false(navigator.windowControlsOverlay.visible);
+  }, 'visible should be false');
+
+  test(function(){
+    assert_idl_attribute(navigator.windowControlsOverlay, 'getTitlebarAreaRect');
+  }, 'getTitlebarAreaRect should be a method of the windowControlsOverlay object');
+
+  test(function(){
+    var rect = navigator.windowControlsOverlay.getTitlebarAreaRect();
+    assert_true(rect instanceof DOMRect);
+  }, 'getTitlebarAreaRect return type should be DOMRect');
+
+  test(function(){
+    var rect = navigator.windowControlsOverlay.getTitlebarAreaRect();
+    assert_equals(rect.x, 0);
+    assert_equals(rect.y, 0);
+    assert_equals(rect.width, 0);
+    assert_equals(rect.height, 0);
+  }, 'getTitlebarAreaRect should return a empty DOMRect');
+
+  test(function(){
+    assert_idl_attribute(navigator.windowControlsOverlay, 'ongeometrychange');
+  }, 'ongeometrychange should be a member of the windowControlsOverlay object');
+</script>
diff --git a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
deleted file mode 100644
index 3fbe3eaa62..0000000000
--- a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-  test(t => {
-    assert_true("userAgentData" in navigator);
-    assert_true("NavigatorUAData" in window);
-    assert_equals(typeof self.NavigatorUAData, "function")
-  }, "navigator.userAgentData is exposed.");
-
-  promise_test(async t => {
-    let didMicrotaskRun = false;
-    const uaData = navigator.userAgentData;
-    const brandRegex = /^[a-zA-Z ()\-.\/:;=?_]+$/;
-    for (brandVersionPair of uaData.brands) {
-      assert_equals(typeof brandVersionPair.brand, "string", "brand should be a string");
-      assert_regexp_match(brandVersionPair.brand, brandRegex, "brand should not contain unexpected characters");
-      assert_equals(typeof brandVersionPair.version, "string", "version should be a string");
-    }
-    assert_equals(typeof uaData.mobile, "boolean", "mobile should be a boolean");
-
-    const highEntropyData = await uaData.getHighEntropyValues([
-      "platformVersion", "architecture", "model", "uaFullVersion", "fullVersionList", "formFactors"]);
-    assert_equals(typeof highEntropyData["platform"], "string", "Platform brand should be a string");
-    assert_equals(typeof highEntropyData["platformVersion"], "string", "Platform version should be a string");
-    assert_equals(typeof highEntropyData["architecture"], "string", "Architecture should be a string");
-    assert_equals(typeof highEntropyData["model"], "string", "Model should be a string");
-    assert_equals(typeof highEntropyData["uaFullVersion"], "string", "UAFullVersion should be a string");
-    for (formFactor of highEntropyData['formFactors']) {
-      assert_equals(typeof formFactor, "string", "Each FormFactors value should be a string");
-    }
-    for (brandVersionPair of highEntropyData['fullVersionList']) {
-      assert_equals(typeof brandVersionPair.brand, "string", "brand should be a string");
-      assert_regexp_match(brandVersionPair.brand, brandRegex, "brand should not contain unexpected characters");
-      assert_equals(typeof brandVersionPair.version, "string", "version should be a string");
-    }
-    const highEntropyData2 = await uaData.getHighEntropyValues([]);
-    assert_equals(typeof highEntropyData["platform"], "string", "Platform brand should be a string");
-    assert_false("platformVersion" in highEntropyData2, "Platform version should be an empty string");
-    assert_false("architecture" in highEntropyData2, "Architecture should be an empty string");
-    assert_false("model" in highEntropyData2, "Model should be an empty string");
-    assert_false("uaFullVersion" in highEntropyData2, "UAFullVersion should be an empty string");
-    assert_false("formFactors" in highEntropyData2, "FormFactors should be an empty array");
-    assert_false("fullVersionList" in highEntropyData2, "fullVersionList should not be present");
-    let finalPromise = uaData.getHighEntropyValues([]).then(() => {
-      assert_true(didMicrotaskRun, "getHighEntropyValues queued on a task");
-    });
-    await Promise.resolve().then(function() {
-      didMicrotaskRun = true;
-    });
-    return finalPromise;
-  }, "navigator.userAgentData returns a UserAgentMetadata object.");
-</script>
diff --git a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.tentative.html b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.tentative.html
new file mode 100644
index 0000000000..3fbe3eaa62
--- /dev/null
+++ b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.tentative.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(t => {
+    assert_true("userAgentData" in navigator);
+    assert_true("NavigatorUAData" in window);
+    assert_equals(typeof self.NavigatorUAData, "function")
+  }, "navigator.userAgentData is exposed.");
+
+  promise_test(async t => {
+    let didMicrotaskRun = false;
+    const uaData = navigator.userAgentData;
+    const brandRegex = /^[a-zA-Z ()\-.\/:;=?_]+$/;
+    for (brandVersionPair of uaData.brands) {
+      assert_equals(typeof brandVersionPair.brand, "string", "brand should be a string");
+      assert_regexp_match(brandVersionPair.brand, brandRegex, "brand should not contain unexpected characters");
+      assert_equals(typeof brandVersionPair.version, "string", "version should be a string");
+    }
+    assert_equals(typeof uaData.mobile, "boolean", "mobile should be a boolean");
+
+    const highEntropyData = await uaData.getHighEntropyValues([
+      "platformVersion", "architecture", "model", "uaFullVersion", "fullVersionList", "formFactors"]);
+    assert_equals(typeof highEntropyData["platform"], "string", "Platform brand should be a string");
+    assert_equals(typeof highEntropyData["platformVersion"], "string", "Platform version should be a string");
+    assert_equals(typeof highEntropyData["architecture"], "string", "Architecture should be a string");
+    assert_equals(typeof highEntropyData["model"], "string", "Model should be a string");
+    assert_equals(typeof highEntropyData["uaFullVersion"], "string", "UAFullVersion should be a string");
+    for (formFactor of highEntropyData['formFactors']) {
+      assert_equals(typeof formFactor, "string", "Each FormFactors value should be a string");
+    }
+    for (brandVersionPair of highEntropyData['fullVersionList']) {
+      assert_equals(typeof brandVersionPair.brand, "string", "brand should be a string");
+      assert_regexp_match(brandVersionPair.brand, brandRegex, "brand should not contain unexpected characters");
+      assert_equals(typeof brandVersionPair.version, "string", "version should be a string");
+    }
+    const highEntropyData2 = await uaData.getHighEntropyValues([]);
+    assert_equals(typeof highEntropyData["platform"], "string", "Platform brand should be a string");
+    assert_false("platformVersion" in highEntropyData2, "Platform version should be an empty string");
+    assert_false("architecture" in highEntropyData2, "Architecture should be an empty string");
+    assert_false("model" in highEntropyData2, "Model should be an empty string");
+    assert_false("uaFullVersion" in highEntropyData2, "UAFullVersion should be an empty string");
+    assert_false("formFactors" in highEntropyData2, "FormFactors should be an empty array");
+    assert_false("fullVersionList" in highEntropyData2, "fullVersionList should not be present");
+    let finalPromise = uaData.getHighEntropyValues([]).then(() => {
+      assert_true(didMicrotaskRun, "getHighEntropyValues queued on a task");
+    });
+    await Promise.resolve().then(function() {
+      didMicrotaskRun = true;
+    });
+    return finalPromise;
+  }, "navigator.userAgentData returns a UserAgentMetadata object.");
+</script>
-- 
cgit v1.2.3

