From 89263f03b422c87c5e2842707a38658253022d5a Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Tue, 5 Dec 2017 19:47:10 +0000
Subject: [PATCH 01/10] Fix race in wpt /wasm/wasm_local_iframe_test.html ()
 bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1383683
 gecko-commit: e219b2b152d795da623814d7aeae3a89b1d2726e
 gecko-integration-branch: central gecko-reviewers: bz

---
 wasm/wasm_local_iframe_test.html | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/wasm/wasm_local_iframe_test.html b/wasm/wasm_local_iframe_test.html
index 9ccebdc75394a1..0f4fbd0c7191ec 100644
--- a/wasm/wasm_local_iframe_test.html
+++ b/wasm/wasm_local_iframe_test.html
@@ -2,16 +2,18 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/load_wasm.js"></script>
-<iframe src="resources/frame.html" id="iframe"></iframe>
 <script>
-  promise_test(async function() {
-    var mod = await createWasmModule();
-    assert_true(mod instanceof WebAssembly.Module);
-    var ans = await new Promise((resolve, reject) => {
-      var iframe = document.getElementById("iframe").contentWindow;
-      iframe.postMessage(mod, '*');
-      window.addEventListener("message", (reply) => resolve(reply.data), false);
-    });
-    assert_equals(ans, 43);
-  }, "send wasm module to iframe");
+  function runTests(iframe) {
+      iframe = iframe.contentWindow;
+      promise_test(async function() {
+        var mod = await createWasmModule();
+        assert_true(mod instanceof WebAssembly.Module);
+        var ans = await new Promise((resolve, reject) => {
+          iframe.postMessage(mod, '*');
+          window.addEventListener("message", (reply) => resolve(reply.data), false);
+        });
+        assert_equals(ans, 43);
+      }, "send wasm module to iframe");
+  }
 </script>
+<iframe src="resources/frame.html" onload="runTests(this)"></iframe>

From f8f63e252b375635e242bc4a2ccba9dd387424ee Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Tue, 5 Dec 2017 20:11:25 +0000
Subject: [PATCH 02/10] part 1 - Add internal overflow-clip-box-block/-inline
 properties and make overflow-clip-box a shorthand. bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1422839 gecko-commit:
 cf93ccd03ca7d452aa1e1e9bff575f0992df7874 gecko-integration-branch: autoland
 gecko-reviewers: dholbert

---
 .../animation-model/animation-types/property-list.js        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web-animations/animation-model/animation-types/property-list.js b/web-animations/animation-model/animation-types/property-list.js
index 46829c31495400..32bf63d3a82175 100644
--- a/web-animations/animation-model/animation-types/property-list.js
+++ b/web-animations/animation-model/animation-types/property-list.js
@@ -1054,12 +1054,6 @@ const gCSSProperties = {
     types: [
     ]
   },
-  'overflow-clip-box': {
-    // https://developer.mozilla.org/en/docs/Web/CSS/overflow-clip-box
-    types: [
-      { type: 'discrete', options: [ [ 'padding-box', 'content-box' ] ] }
-    ]
-  },
   'overflow-wrap': {
     // https://drafts.csswg.org/css-text-3/#propdef-overflow-wrap
     types: [

From 79e857b55d76794edde1ff15420c2fcf9cff3725 Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 16:24:20 +0000
Subject: [PATCH 03/10] P5 Fix race in about-blank-replacement.https.html popup
 test case. bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug
 1423412 gecko-commit: 7750a46652fa83acc6b8cd3e3bee8f428d24bfd5
 gecko-integration-branch: central gecko-reviewers: baku

---
 .../resources/about-blank-replacement-popup-frame.py         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py b/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py
index be5294539833c7..f0b8cd578e3e05 100644
--- a/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py
+++ b/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py
@@ -12,12 +12,15 @@ def main(request, response):
 <script>
 function nestedLoaded() {
   parent.postMessage({ type: 'NESTED_LOADED' }, '*');
-  popup.close();
 }
 
 let popup = window.open('?nested=true');
 popup.onload = nestedLoaded;
 
+addEventListener('unload', evt => {
+  popup.close();
+}, { once: true });
+
 // Helper routine to make it slightly easier for our parent to find
 // the nested popup window.
 function nested() {

From 41df17bff6d7ea47e53d7922d4a08aee5f9a9619 Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 18:18:03 +0000
Subject: [PATCH 04/10] Upstream :any-link reftest to WPT. bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1422319 gecko-commit:
 b10b128a4a23768315d1f951c777b29adbc242b4 gecko-integration-branch: central
 gecko-reviewers: xidorn

---
 css/selectors/any-link-dynamic-001-ref.html | 10 ++++++++++
 css/selectors/any-link-dynamic-001.html     | 14 ++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 css/selectors/any-link-dynamic-001-ref.html
 create mode 100644 css/selectors/any-link-dynamic-001.html

diff --git a/css/selectors/any-link-dynamic-001-ref.html b/css/selectors/any-link-dynamic-001-ref.html
new file mode 100644
index 00000000000000..b5407429be803d
--- /dev/null
+++ b/css/selectors/any-link-dynamic-001-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<style>
+  span { color: green; }
+</style>
+<body>
+  <a></a><span>This should be green</span>
+</body>
diff --git a/css/selectors/any-link-dynamic-001.html b/css/selectors/any-link-dynamic-001.html
new file mode 100644
index 00000000000000..e84989fd0c2708
--- /dev/null
+++ b/css/selectors/any-link-dynamic-001.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test: Handling of dynamic changes to :any-link selectors</title>
+<link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
+<link rel="match" href="any-link-dynamic-001-ref.html">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-any-link-pseudo">
+<style>
+  span { color: green; }
+  :any-link + span { color: red; }
+</style>
+<body onload="window.oldColor = getComputedStyle(document.querySelector('span')).color;
+              document.querySelector('a').removeAttribute('href');">
+  <a href=""></a><span>This should be green</span>
+</body>

From aba92c0c29f88d5ac522ca51a7e2eb5f49b62878 Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 18:18:20 +0000
Subject: [PATCH 05/10] Accept cookie domains with leading dot character

Domain cookies retrieved from Marionette have leading dot characters in
them. This change will ensure that adding cookies with leading dot
characters works as expected.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1415828
gecko-commit: f5e24faf36fc0a27e5255ce2a22e0f50d1da2f36
gecko-integration-branch: central
gecko-reviewers: ato
---
 webdriver/tests/cookies/add_cookie.py       | 45 ++++++++++++++++++---
 webdriver/tests/cookies/get_named_cookie.py |  6 +--
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/webdriver/tests/cookies/add_cookie.py b/webdriver/tests/cookies/add_cookie.py
index 86a5f86f374603..1ebbcb41de7125 100644
--- a/webdriver/tests/cookies/add_cookie.py
+++ b/webdriver/tests/cookies/add_cookie.py
@@ -1,15 +1,14 @@
 from tests.support.fixtures import clear_all_cookies
-from tests.support.fixtures import server_config
 from datetime import datetime, timedelta
 
-def test_add_domain_cookie(session, url):
+def test_add_domain_cookie(session, url, server_config):
     session.url = url("/common/blank.html")
     clear_all_cookies(session)
     create_cookie_request = {
         "cookie": {
             "name": "hello",
             "value": "world",
-            "domain": "web-platform.test",
+            "domain": server_config["domains"][""],
             "path": "/",
             "httpOnly": False,
             "secure": False
@@ -37,16 +36,16 @@ def test_add_domain_cookie(session, url):
 
     assert cookie["name"] == "hello"
     assert cookie["value"] == "world"
-    assert cookie["domain"] == ".web-platform.test"
+    assert cookie["domain"] == ".%s" % server_config["domains"][""]
 
-def test_add_cookie_for_ip(session, url, server_config):
+def test_add_cookie_for_ip(session, url, server_config, configuration):
     session.url = "http://127.0.0.1:%s/404" % (server_config["ports"]["http"][0])
     clear_all_cookies(session)
     create_cookie_request = {
         "cookie": {
             "name": "hello",
             "value": "world",
-            "domain": "127.0.0.1",
+            "domain": configuration["host"],
             "path": "/",
             "httpOnly": False,
             "secure": False
@@ -142,3 +141,37 @@ def test_add_session_cookie(session, url):
 
     assert cookie["name"] == "hello"
     assert cookie["value"] == "world"
+
+def test_add_session_cookie_with_leading_dot_character_in_domain(session, url, server_config):
+    session.url = url("/common/blank.html")
+    clear_all_cookies(session)
+    create_cookie_request = {
+        "cookie": {
+            "name": "hello",
+            "value": "world",
+            "domain": ".%s" % server_config["domains"][""]
+        }
+    }
+    result = session.transport.send("POST", "session/%s/cookie" % session.session_id, create_cookie_request)
+    assert result.status == 200
+    assert "value" in result.body
+    assert isinstance(result.body["value"], dict)
+
+    result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
+    assert result.status == 200
+    assert "value" in result.body
+    assert isinstance(result.body["value"], list)
+    assert len(result.body["value"]) == 1
+    assert isinstance(result.body["value"][0], dict)
+
+    cookie = result.body["value"][0]
+    assert "name" in cookie
+    assert isinstance(cookie["name"], basestring)
+    assert "value" in cookie
+    assert isinstance(cookie["value"], basestring)
+    assert "domain" in cookie
+    assert isinstance(cookie["domain"], basestring)
+
+    assert cookie["name"] == "hello"
+    assert cookie["value"] == "world"
+    assert cookie["domain"] == ".%s" % server_config["domains"][""]
diff --git a/webdriver/tests/cookies/get_named_cookie.py b/webdriver/tests/cookies/get_named_cookie.py
index 027859dd7f9d12..f367eccf947ab6 100644
--- a/webdriver/tests/cookies/get_named_cookie.py
+++ b/webdriver/tests/cookies/get_named_cookie.py
@@ -61,14 +61,14 @@ def test_get_named_cookie(session, url):
     # convert from seconds since epoch
     assert datetime.utcfromtimestamp(cookie["expiry"]).strftime(utc_string_format) == a_year_from_now
 
-def test_duplicated_cookie(session, url):
+def test_duplicated_cookie(session, url, server_config):
     session.url = url("/common/blank.html")
     clear_all_cookies(session)
     create_cookie_request = {
         "cookie": {
             "name": "hello",
             "value": "world",
-            "domain": "web-platform.test",
+            "domain": server_config["domains"][""],
             "path": "/",
             "httpOnly": False,
             "secure": False
@@ -79,7 +79,7 @@ def test_duplicated_cookie(session, url):
     assert "value" in result.body
     assert isinstance(result.body["value"], dict)
 
-    session.url = inline("<script>document.cookie = 'hello=newworld; domain=web-platform.test; path=/';</script>")
+    session.url = inline("<script>document.cookie = 'hello=newworld; domain=%s; path=/';</script>" % server_config["domains"][""])
     result = session.transport.send("GET", "session/%s/cookie" % session.session_id)
     assert result.status == 200
     assert "value" in result.body

From a59f44649f1beef175896409cb657e5a88f26961 Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 18:20:21 +0000
Subject: [PATCH 06/10] Move element retrieval WPT tests to single directory.
 bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1421675
 gecko-commit: 4bdcd7f6e1978b4769629208fb479d93a859018a
 gecko-integration-branch: central gecko-reviewers: maja_zf

---
 webdriver/tests/{retrieval => element_retrieval}/__init__.py      | 0
 webdriver/tests/{retrieval => element_retrieval}/find_element.py  | 0
 .../{retrieval => element_retrieval}/find_element_from_element.py | 0
 .../find_element_from_elements.py                                 | 0
 webdriver/tests/{retrieval => element_retrieval}/find_elements.py | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename webdriver/tests/{retrieval => element_retrieval}/__init__.py (100%)
 rename webdriver/tests/{retrieval => element_retrieval}/find_element.py (100%)
 rename webdriver/tests/{retrieval => element_retrieval}/find_element_from_element.py (100%)
 rename webdriver/tests/{retrieval => element_retrieval}/find_element_from_elements.py (100%)
 rename webdriver/tests/{retrieval => element_retrieval}/find_elements.py (100%)

diff --git a/webdriver/tests/retrieval/__init__.py b/webdriver/tests/element_retrieval/__init__.py
similarity index 100%
rename from webdriver/tests/retrieval/__init__.py
rename to webdriver/tests/element_retrieval/__init__.py
diff --git a/webdriver/tests/retrieval/find_element.py b/webdriver/tests/element_retrieval/find_element.py
similarity index 100%
rename from webdriver/tests/retrieval/find_element.py
rename to webdriver/tests/element_retrieval/find_element.py
diff --git a/webdriver/tests/retrieval/find_element_from_element.py b/webdriver/tests/element_retrieval/find_element_from_element.py
similarity index 100%
rename from webdriver/tests/retrieval/find_element_from_element.py
rename to webdriver/tests/element_retrieval/find_element_from_element.py
diff --git a/webdriver/tests/retrieval/find_element_from_elements.py b/webdriver/tests/element_retrieval/find_element_from_elements.py
similarity index 100%
rename from webdriver/tests/retrieval/find_element_from_elements.py
rename to webdriver/tests/element_retrieval/find_element_from_elements.py
diff --git a/webdriver/tests/retrieval/find_elements.py b/webdriver/tests/element_retrieval/find_elements.py
similarity index 100%
rename from webdriver/tests/retrieval/find_elements.py
rename to webdriver/tests/element_retrieval/find_elements.py

From 8ba9bef8ef6ebedca600042557c3edebd4230045 Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 18:17:44 +0000
Subject: [PATCH 07/10] Fix test failures. bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1037335 gecko-commit:
 7678ac4b15adf33769ce558814fe44f84447ebe6 gecko-integration-branch: central
 gecko-reviewers: ckerschb

---
 content-security-policy/securitypolicyviolation/idl.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content-security-policy/securitypolicyviolation/idl.html b/content-security-policy/securitypolicyviolation/idl.html
index 17f492e7344de6..a4f9e68f8314db 100644
--- a/content-security-policy/securitypolicyviolation/idl.html
+++ b/content-security-policy/securitypolicyviolation/idl.html
@@ -21,6 +21,9 @@
       long           lineNumber;
       long           columnNumber;
   };
+
+  interface Event {
+  };
 </script>
 <script type="text/plain" id="tested">
   [Constructor(DOMString type, optional SecurityPolicyViolationEventInit eventInitDict)]

From b8fbd4ab8c3599579951c97824cedefb871bbcdf Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 18:17:46 +0000
Subject: [PATCH 08/10] Fix timing issue of web-platform test:
 content-security-policy/style-src/style-src-imported-style-blocked.html.
 bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1037335
 gecko-commit: fd99633486a59a1771e84214998043e1a3684945
 gecko-integration-branch: central gecko-reviewers: ckerschb

---
 .../style-src/style-src-imported-style-blocked.html        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/content-security-policy/style-src/style-src-imported-style-blocked.html b/content-security-policy/style-src/style-src-imported-style-blocked.html
index 19066119c4d7ab..a00888098a5bc6 100644
--- a/content-security-policy/style-src/style-src-imported-style-blocked.html
+++ b/content-security-policy/style-src/style-src-imported-style-blocked.html
@@ -12,8 +12,13 @@
       document.addEventListener("securitypolicyviolation", t_spv.step_func_done(function(e) {
         assert_equals("style-src", e.violatedDirective);
       }));
+
+      var l = document.createElement("link");
+      l.setAttribute("href", "/content-security-policy/style-src/resources/style-src-import.sub.css");
+      l.setAttribute("rel", "stylesheet");
+      l.setAttribute("type", "text/css");
+      document.head.appendChild(l);
     </script>
-    <link href="/content-security-policy/style-src/resources/style-src-import.sub.css" rel=stylesheet type=text/css>
 </head>
 <body>
     <div id='log'></div>

From 6be87daac58455f0e7ffe7f6c24459c9728668a6 Mon Sep 17 00:00:00 2001
From: wpt-sync <wpt-sync@lists.mozilla.com>
Date: Thu, 7 Dec 2017 18:21:09 +0000
Subject: [PATCH 09/10] Remove duplicated WebDriver WebIDL test.

This test is duplicated in
testing/web-platform/tests/webdriver/tests/interface.html.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=Bug 1421676
gecko-commit: ad8f6896b87dfabdbbf0d6db28bdfaaf16158f6a
gecko-integration-branch: central
gecko-reviewers: maja_zf
---
 webdriver/interface/interface.html | 40 ------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 webdriver/interface/interface.html

diff --git a/webdriver/interface/interface.html b/webdriver/interface/interface.html
deleted file mode 100644
index f3c149b1cee06b..00000000000000
--- a/webdriver/interface/interface.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-<script type=text/plain class=untested>
-[Exposed=Window]
-interface Navigator {
-  // objects implementing this interface also implement the interfaces given below
-};
-</script>
-<script type=text/plain>
-Navigator implements NavigatorAutomationInformation;
-
-[NoInterfaceObject,
- Exposed=(Window)]
-interface NavigatorAutomationInformation {
-    readonly attribute boolean webdriver;
-    // always returns true
-};
-</script>
-<script>
-"use strict";
-
-if ("webdriver" in navigator) {
-  test(() => assert_true(navigator.webdriver), "navigator.webdriver is always true");
-  var idlArray = new IdlArray();
-  [].forEach.call(document.querySelectorAll("script[type=text\\/plain]"), function(node) {
-    if (node.className == "untested") {
-      idlArray.add_untested_idls(node.textContent);
-    } else {
-      idlArray.add_idls(node.textContent);
-    }
-  });
-  idlArray.test();
-} else {
-  done();
-}
-</script>

From 01074a1783be8a491d0ff4b584d8a3a2fe867a6b Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:17:03 +0000
Subject: [PATCH 10/10] Preprocess wpt lint paths to be relative to the wpt
 root bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1428582
 gecko-commit: 03edb935ed6841a7fd43dfbc4b5cb0b939d5b8aa
 gecko-integration-branch: central gecko-reviewers: jgraham

---
 tools/lint/lint.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/lint/lint.py b/tools/lint/lint.py
index 3228524353b396..c1a6ce02d1e3c2 100644
--- a/tools/lint/lint.py
+++ b/tools/lint/lint.py
@@ -722,7 +722,8 @@ def changed_files(wpt_root):
 
 def lint_paths(kwargs, wpt_root):
     if kwargs.get("paths"):
-        paths = kwargs["paths"]
+        r = os.path.realpath(wpt_root)
+        paths = [os.path.relpath(os.path.realpath(x), r) for x in kwargs["paths"]]
     elif kwargs["all"]:
         paths = list(all_filesystem_paths(wpt_root))
     else: