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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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 229d087a1f14d2df3e5df3336c3fc5c70737ac69 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:12:35 +0000
Subject: [PATCH 10/26] Remove animationiteration from legacy event listener
 test, make the transition tests more robust, and re-enable that test.

According to :birtles, it is not guaranteed that animationiteration
event will be fired. This event is sample-based rather than event-based,
and such behavior has been clarified in CSS Animations Level 2:
https://drafts.csswg.org/css-animations-2/#event-dispatch

Also, Chromium has the same issue with this test:
https://bugs.chromium.org/p/chromium/issues/detail?id=701445
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1351409
gecko-commit: fa855df2e888bb6edbed237d7a6b78ab6476c96b
gecko-integration-branch: central
gecko-reviewers: jmaher
---
 dom/events/EventListener-invoke-legacy.html | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/dom/events/EventListener-invoke-legacy.html b/dom/events/EventListener-invoke-legacy.html
index 85a4b0a5fe64ef..a01afcd8d1985c 100644
--- a/dom/events/EventListener-invoke-legacy.html
+++ b/dom/events/EventListener-invoke-legacy.html
@@ -51,22 +51,16 @@
 }
 
 function setupTransition(elem) {
-  elem.style.transition = '';
-  requestAnimationFrame(function() {
-    elem.style.color = 'red';
-    elem.style.transition = 'color 30ms';
-    requestAnimationFrame(function() {
-      elem.style.color = 'green';
-    });
-  });
+  getComputedStyle(elem).color;
+  elem.style.color = 'green';
+  elem.style.transition = 'color 30ms';
 }
 
 function setupAnimation(elem) {
-  elem.style.animation = 'test 30ms 2';
+  elem.style.animation = 'test 30ms';
 }
 
 runLegacyEventTest('transitionend', 'webkitTransitionEnd', "TransitionEvent", setupTransition);
 runLegacyEventTest('animationend', 'webkitAnimationEnd', "AnimationEvent", setupAnimation);
-runLegacyEventTest('animationiteration', 'webkitAnimationIteration', "AnimationEvent", setupAnimation);
 runLegacyEventTest('animationstart', 'webkitAnimationStart', "AnimationEvent", setupAnimation);
 </script>

From 653d2fb82095855042cc334076417c374c461683 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:12:59 +0000
Subject: [PATCH 11/26] Handle errors for inline module scripts and ensure we
 update the module map after fetch errors bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1426140 gecko-commit:
 a8f97458d0cc43a62b048a5ebb4a8b1663d18b20 gecko-integration-branch: central
 gecko-reviewers: baku

---
 .../the-script-element/module/load-error-events-inline.html      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html b/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html
index c4dd0807f62a62..58397dd07d48b4 100644
--- a/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html
+++ b/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html
@@ -59,4 +59,3 @@
 <script onload="onLoad(test4_load);" onerror="onError(test4_load);" type="module" async>"use strict";onExecute(test4_load);</script>
 <script onload="onLoad(test1_error);" onerror="onError(test1_error);" type="module">"use strict";import "./not_found.js";</script>
 <script onload="onLoad(test4_error);" onerror="onError(test4_error);" type="module" async>"use strict";import "./not_found.js";</script>
-</script>

From 90466ecb204beff2d11578a71e4181c3253022e5 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:12:48 +0000
Subject: [PATCH 12/26] P1: Update the wpt tests to expect to reject the cors
 synthesized response to a same origin request. bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1427978 gecko-commit:
 e3edde0c2242804300ebd96b0a0f648ace682688 gecko-integration-branch: central
 gecko-reviewers: bkelly

---
 .../service-worker/fetch-response-taint.https.html   |  6 ++++++
 .../service-worker/worker-interception.https.html    | 12 +++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/service-workers/service-worker/fetch-response-taint.https.html b/service-workers/service-worker/fetch-response-taint.https.html
index a6e7f984ea2449..8ebee0c07374c3 100644
--- a/service-workers/service-worker/fetch-response-taint.https.html
+++ b/service-workers/service-worker/fetch-response-taint.https.html
@@ -193,6 +193,9 @@
   // Fetch to the other origin with same-origin mode should fail.
   if (origin == OTHER_ORIGIN && mode == 'same-origin') {
     ng_test(url, mode, credentials);
+  } else if (origin == BASE_ORIGIN && mode == 'same-origin') {
+    // Cors type response to a same-origin mode request should fail
+    ng_test(url, mode, credentials);
   } else {
     // The response from the SW should be cors.
     ok_test(url, mode, credentials, 'cors', 'undefined');
@@ -208,6 +211,9 @@
   // Fetch to the other origin with same-origin mode should fail.
   if (origin == OTHER_ORIGIN && mode == 'same-origin') {
     ng_test(url, mode, credentials);
+  } else if (origin == BASE_ORIGIN && mode == 'same-origin') {
+    // Cors type response to a same-origin mode request should fail
+    ng_test(url, mode, credentials);
   } else {
     // The response from the SW should be cors.
     ok_test(url, mode, credentials, 'cors', 'username1s');
diff --git a/service-workers/service-worker/worker-interception.https.html b/service-workers/service-worker/worker-interception.https.html
index 3ec66a54b6e1e5..4f14746d917f9e 100644
--- a/service-workers/service-worker/worker-interception.https.html
+++ b/service-workers/service-worker/worker-interception.https.html
@@ -81,10 +81,16 @@
             });
         })
       .then(function(data) {
-          assert_equals(data, 'dummy-worker-script loaded');
+          assert_unreached('intercepted cors response to a same-origin mode ' +
+                           'worker load should fail');
           service_worker_unregister_and_done(t, scope);
-        });
-  }, 'Verify worker script intercepted by cors response succeeds');
+        })
+      .catch(function(e) {
+          assert_true(true, 'intercepted cors response to a same-origin mode ' +
+                            'worker load should fail');
+          service_worker_unregister_and_done(t, scope);
+       });
+  }, 'Verify worker script intercepted by cors response fails');
 
 promise_test(function(t) {
     var worker_url = 'resources/dummy-no-cors-worker.js';

From 980addd1a04de0da2953a598f8692fa1e3910dd3 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:13:49 +0000
Subject: [PATCH 13/26] Fix test code that makes incorrect assumptions about
 when scripts are run bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1426675 gecko-commit:
 afef4f6c98755643a56ad15e39b3ac885877eb7d gecko-integration-branch: central
 gecko-reviewers: jgraham

---
 .../the-script-element/module/instantiation-error-3.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html b/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html
index ab510c675ad170..27e50f7fd69537 100644
--- a/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html
+++ b/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html
@@ -26,4 +26,4 @@
 <script type="module" src="./cycle-unresolvable-a.js"
     onerror="unreachable()" onload="log.push(2)"></script>
 <script type="module" src="./cycle-unresolvable.js"
-    onerror="unreachable()" onload="log.push(3)" async></script>
+    onerror="unreachable()" onload="log.push(3)"></script>

From bec3819ff8abe11c9fe93c9c1782d11a143653c0 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:14:01 +0000
Subject: [PATCH 14/26] Fix test that didn't take account of module scripts'
 defer scheduling bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1426642 gecko-commit:
 f6b74e7c3c0943a212e0d2efd73340b8d2157dbb gecko-integration-branch: central
 gecko-reviewers: jgraham

---
 .../the-script-element/module/module-in-xhtml.xhtml         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml b/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml
index 724c9e750743f8..1655e61a7c54e3 100644
--- a/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml
+++ b/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml
@@ -10,7 +10,11 @@
 window.evaluated_module_script = true;
 </script>
 <script>
-test(() => assert_true(window.evaluated_module_script), "module script in XHTML documents should be evaluated.");
+  var test = async_test("module script in XHTML documents should be evaluated.");
+  window.addEventListener("load", () => {
+    test.step(() => { assert_true(window.evaluated_module_script); });
+    test.done();
+  });
 </script>
 </body>
 </html>

From da026901fc528f4dc40168de3d457e2604f44191 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:14:15 +0000
Subject: [PATCH 15/26] Fix incorrect custom element type in CustomElementData.
 f=echen, bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1419662 gecko-commit:
 48bb9add84a85b085b2739d37798086fc6fd91d9 gecko-integration-branch: central
 gecko-reviewers: smaug

---
 custom-elements/Document-createElement.html   | 15 ++++++
 ...er-constructs-custom-elements-with-is.html | 51 +++++++++++++++++++
 custom-elements/upgrading/Node-cloneNode.html | 19 +++++++
 3 files changed, 85 insertions(+)
 create mode 100644 custom-elements/parser/parser-constructs-custom-elements-with-is.html

diff --git a/custom-elements/Document-createElement.html b/custom-elements/Document-createElement.html
index e446c507ca865a..52a68e8e178976 100644
--- a/custom-elements/Document-createElement.html
+++ b/custom-elements/Document-createElement.html
@@ -29,6 +29,21 @@
 
 }, 'document.createElement must create an instance of custom elements');
 
+test(function () {
+    class AutonomousCustomElement extends HTMLElement {};
+    class IsCustomElement extends HTMLElement {};
+
+    customElements.define('autonomous-custom-element', AutonomousCustomElement);
+    customElements.define('is-custom-element', IsCustomElement);
+
+    var instance = document.createElement('autonomous-custom-element', { is: "is-custom-element"});
+
+    assert_true(instance instanceof AutonomousCustomElement);
+    assert_equals(instance.localName, 'autonomous-custom-element');
+    assert_equals(instance.namespaceURI, 'http://www.w3.org/1999/xhtml', 'A custom element HTML must use HTML namespace');
+
+}, 'document.createElement must create an instance of autonomous custom elements when it has is attribute');
+
 function assert_reports(expected, testFunction, message) {
     var uncaughtError = null;
     window.onerror = function (message, url, lineNumber, columnNumber, error) { uncaughtError = error; return true; }
diff --git a/custom-elements/parser/parser-constructs-custom-elements-with-is.html b/custom-elements/parser/parser-constructs-custom-elements-with-is.html
new file mode 100644
index 00000000000000..96c00278a3d7a0
--- /dev/null
+++ b/custom-elements/parser/parser-constructs-custom-elements-with-is.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Custom Elements: Changes to the HTML parser</title>
+<meta name="author" title="John Dai" href="mailto:jdai@mozilla.com">
+<meta name="assert" content="HTML parser creates a custom element which contains is attribute">
+<link rel="help" href="https://html.spec.whatwg.org/#create-an-element-for-the-token">
+<link rel="help" href="https://dom.spec.whatwg.org/#concept-create-element">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<autonomous-custom-element id="instance1" is="is-custom-element"></autonomous-custom-element>
+<script>
+
+class AutonomousCustomElement extends HTMLElement { };
+class IsCustomElement extends HTMLElement { };
+
+customElements.define('autonomous-custom-element', AutonomousCustomElement);
+customElements.define('is-custom-element', IsCustomElement);
+
+test(function () {
+    var customElement = document.getElementById('instance1');
+
+    assert_true(customElement instanceof HTMLElement, 'A resolved custom element must be an instance of HTMLElement');
+    assert_false(customElement instanceof HTMLUnknownElement, 'A resolved custom element must NOT be an instance of HTMLUnknownElement');
+    assert_true(customElement instanceof AutonomousCustomElement, 'A resolved custom element must be an instance of that custom element');
+    assert_equals(customElement.localName, 'autonomous-custom-element');
+    assert_equals(customElement.namespaceURI, 'http://www.w3.org/1999/xhtml', 'A custom element HTML must use HTML namespace');
+
+}, 'HTML parser must create a defined autonomous custom element when customElements.define comes after HTML parser creation');
+
+</script>
+<autonomous-custom-element id="instance2" is="is-custom-element"></autonomous-custom-element>
+<script>
+
+test(function () {
+    var customElement = document.getElementById('instance2');
+
+    assert_true(customElement instanceof HTMLElement, 'A resolved custom element must be an instance of HTMLElement');
+    assert_false(customElement instanceof HTMLUnknownElement, 'A resolved custom element must NOT be an instance of HTMLUnknownElement');
+    assert_true(customElement instanceof AutonomousCustomElement, 'A resolved custom element must be an instance of that custom element');
+    assert_equals(customElement.localName, 'autonomous-custom-element');
+    assert_equals(customElement.namespaceURI, 'http://www.w3.org/1999/xhtml', 'A custom element HTML must use HTML namespace');
+
+}, 'HTML parser must create a defined autonomous custom element when customElements.define comes before HTML parser creation');
+
+</script>
+</body>
+</html>
diff --git a/custom-elements/upgrading/Node-cloneNode.html b/custom-elements/upgrading/Node-cloneNode.html
index 0d158fd59e4863..0492e1f39a131d 100644
--- a/custom-elements/upgrading/Node-cloneNode.html
+++ b/custom-elements/upgrading/Node-cloneNode.html
@@ -30,6 +30,25 @@
         'A cloned custom element must be an instance of the custom element');
 }, 'Node.prototype.cloneNode(false) must be able to clone a custom element');
 
+test(function () {
+    class AutonomousCustomElement extends HTMLElement {};
+    class IsCustomElement extends HTMLElement {};
+
+    customElements.define('autonomous-custom-element', AutonomousCustomElement);
+    customElements.define('is-custom-element', IsCustomElement);
+
+    var instance = document.createElement('autonomous-custom-element', { is: "is-custom-element"});
+    assert_true(instance instanceof HTMLElement);
+    assert_true(instance instanceof AutonomousCustomElement);
+
+    var clone = instance.cloneNode(false);
+    assert_not_equals(instance, clone);
+    assert_true(clone instanceof HTMLElement,
+        'A cloned custom element must be an instance of HTMLElement');
+    assert_true(clone instanceof AutonomousCustomElement,
+        'A cloned custom element must be an instance of the custom element');
+}, 'Node.prototype.cloneNode(false) must be able to clone as a autonomous custom element when it contains is attribute');
+
 test_with_window(function (contentWindow) {
     var contentDocument = contentWindow.document;
     class MyCustomElement extends contentWindow.HTMLElement {}

From 728ba2842e9092a2ddb6cf7e7e8a93680842ec59 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:14:27 +0000
Subject: [PATCH 16/26] Fix inheritance of animation and transition properties
 of mismatched length.

At least when the animation-name length is bigger than the animation properties,
we mess up inheritance and only set properly the specified counts, then don't
cycle it.

The nicer fix for this is making these vectors properly, and move the cycling
logic at used-value time (bug 1420928). Same for transitions.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1426246
gecko-commit: 064e0be1cc29617de74098aba4b3bb706775315a
gecko-integration-branch: central
gecko-reviewers: hiro
---
 css/css-animations/animation-delay-011.html | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 css/css-animations/animation-delay-011.html

diff --git a/css/css-animations/animation-delay-011.html b/css/css-animations/animation-delay-011.html
new file mode 100644
index 00000000000000..415a5747553797
--- /dev/null
+++ b/css/css-animations/animation-delay-011.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Animations Test: inherited animation-delay with mismatched animation-name length</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-animations-1/#animations">
+<link rel="match" href="animation-common-ref.html">
+<style>
+div:after {
+  content: '';
+  display: block;
+  width: 100px;
+  height: 100px;
+  background: red;
+  animation: doesntmatter 50s linear infinite,
+             bg 100s step-end infinite;
+  animation-play-state: paused;
+  animation-delay: inherit;
+}
+
+@keyframes bg {
+  50% { background: green; }
+}
+</style>
+<div style="animation-delay: -50s"></div>

From 7add142c339b1c438bfe720b70c58edcd4b70e9b Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:14:39 +0000
Subject: [PATCH 17/26] Stop toggling selectedness state of <option disabled>.

When WebDriver:ElementClick clicks an <option disabled> element,
its selectedness state should according to a new specification
change proposed not change:

	https://github.com/w3c/webdriver/pull/1189

This patch provides tests for the specification change.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1429384
gecko-commit: be8ebea8beb1e445a3382b6b071401f78de6e622
gecko-integration-branch: central
gecko-reviewers: automatedtester
---
 webdriver/tests/element_click/select.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/webdriver/tests/element_click/select.py b/webdriver/tests/element_click/select.py
index 15c36fc454fa6c..ca5e498e72e32e 100644
--- a/webdriver/tests/element_click/select.py
+++ b/webdriver/tests/element_click/select.py
@@ -211,3 +211,15 @@ def test_out_of_view_multiple(session):
     last_option = options[-1]
     last_option.click()
     assert last_option.selected
+
+
+def test_option_disabled(session):
+    session.url = inline("""
+        <select>
+          <option disabled>foo
+        </select>""")
+    option = session.find.css("option", all=False)
+    assert not option.selected
+
+    option.click()
+    assert not option.selected

From ae482ac2198cc12f9bf1de12d6e619a38ebdcd99 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:14:50 +0000
Subject: [PATCH 18/26] Add a test for execution order of inline async module
 scripts bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1361369 gecko-commit:
 db30c73b1542d381d4240f43d76225478105f894 gecko-integration-branch: central
 gecko-reviewers: smaug

---
 .../module/inline-async-execorder.html        | 29 +++++++++++++++++++
 .../module/resources/fast-module.js           |  1 +
 .../module/resources/slow-module.js           |  3 ++
 3 files changed, 33 insertions(+)
 create mode 100644 html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html
 create mode 100644 html/semantics/scripting-1/the-script-element/module/resources/fast-module.js
 create mode 100644 html/semantics/scripting-1/the-script-element/module/resources/slow-module.js

diff --git a/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html b/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html
new file mode 100644
index 00000000000000..db03612e82b42b
--- /dev/null
+++ b/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html
@@ -0,0 +1,29 @@
+<html>
+  <head>
+    <title>Inline async module script execution order</title>
+    <meta name=timeout content=long>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      let loaded = [];
+      let test = async_test("Inline async module script execution order");
+      window.addEventListener("load", test.step_func(function() {
+        assert_array_equals(loaded,
+                            ["fast", "fast", "fast", "slow", "slow", "slow"]);
+      test.done();
+      }));
+    </script>
+    <script type="module" async src="resources/slow-module.js?pipe=trickle(d2)&unique=1"></script>
+    <script type="module" async>
+      import "./resources/slow-module.js?pipe=trickle(d2)&unique=2";
+      loaded.push("slow");
+    </script>
+    <script type="module" async src="resources/fast-module.js?unique=1"></script>
+    <script type="module" async>
+      import "./resources/fast-module.js?unique=2";
+      loaded.push("fast");
+    </script>
+  </body>
+</html>
diff --git a/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js b/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js
new file mode 100644
index 00000000000000..3a76cf71f6c592
--- /dev/null
+++ b/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js
@@ -0,0 +1 @@
+loaded.push("fast");
diff --git a/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js b/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js
new file mode 100644
index 00000000000000..4623ef7360409a
--- /dev/null
+++ b/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js
@@ -0,0 +1,3 @@
+// This module is imported with pipe=trickle(d2) to make it load more slowly
+// than fast-module.js
+loaded.push("slow");

From 51dbc33d47b7625fb362c4d34de5afc39062c062 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:15:17 +0000
Subject: [PATCH 19/26] P2 Make about-blank-replacement.https.html check simple
 about:blank and about:srcdoc cases. bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1426979 gecko-commit:
 a4c611046a0c977a82d0797af446a1b2fca2ee7a gecko-integration-branch: central
 gecko-reviewers: asuth

---
 .../about-blank-replacement.https.html        | 55 +++++++++++++++----
 ...eplacement-blank-dynamic-nested-frame.html | 21 +++++++
 ...-blank-replacement-blank-nested-frame.html | 22 ++++++++
 ...blank-replacement-srcdoc-nested-frame.html | 22 ++++++++
 4 files changed, 108 insertions(+), 12 deletions(-)
 create mode 100644 service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html
 create mode 100644 service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html
 create mode 100644 service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html

diff --git a/service-workers/service-worker/about-blank-replacement.https.html b/service-workers/service-worker/about-blank-replacement.https.html
index 3acfe1b166a68c..e1fefaf290fe52 100644
--- a/service-workers/service-worker/about-blank-replacement.https.html
+++ b/service-workers/service-worker/about-blank-replacement.https.html
@@ -58,7 +58,7 @@
   });
 }
 
-async function doAsyncTest(t, scope, extraSearchParams) {
+async function doAsyncTest(t, scope) {
   let reg = await service_worker_unregister_and_register(t, worker, scope);
   await wait_for_state(t, reg.installing, 'activated');
 
@@ -70,20 +70,30 @@
   let initialResult = frame.contentWindow.nested().document.body.textContent;
   assert_false(initialResult.startsWith('failure:'), `result: ${initialResult}`);
 
+  assert_equals(frame.contentWindow.navigator.serviceWorker.controller.scriptURL,
+                frame.contentWindow.nested().navigator.serviceWorker.controller.scriptURL,
+                'nested about:blank should have same controlling service worker');
+
   // Next, ask the service worker to find the final client ID for the fully
   // loaded nested frame.
-  let nestedURL = new URL(scope, window.location);
-  nestedURL.searchParams.set('nested', true);
-  extraSearchParams = extraSearchParams || {};
-  for (let p in extraSearchParams) {
-    nestedURL.searchParams.set(p, extraSearchParams[p]);
-  }
+  let nestedURL = new URL(frame.contentWindow.nested().location);
   let finalResult = await getClientIdByURL(reg.active, nestedURL);
   assert_false(finalResult.startsWith('failure:'), `result: ${finalResult}`);
 
-  // The initial about:blank client and the final loaded client should have
-  // the same ID value.
-  assert_equals(initialResult, finalResult, 'client ID values should match');
+  // If the nested frame doesn't have a URL to load, then there is no fetch
+  // event and the body should be empty.  We can't verify the final client ID
+  // against anything.
+  if (nestedURL.href === 'about:blank' ||
+      nestedURL.href === 'about:srcdoc') {
+    assert_equals('', initialResult, 'about:blank text content should be blank');
+  }
+
+  // If the nested URL is not about:blank, though, then the fetch event handler
+  // should have populated the body with the client id of the initial about:blank.
+  // Verify the final client id matches.
+  else {
+    assert_equals(initialResult, finalResult, 'client ID values should match');
+  }
 
   frame.remove();
   await service_worker_unregister_and_done(t, scope);
@@ -101,8 +111,7 @@
   // worker can ping the client to verify its existence.  This ping-pong
   // check is performed during the initial load and when verifying the
   // final loaded client.
-  await doAsyncTest(t, 'resources/about-blank-replacement-ping-frame.py',
-                    { 'ping': true });
+  await doAsyncTest(t, 'resources/about-blank-replacement-ping-frame.py');
 }, 'Initial about:blank modified by parent is controlled, exposed to ' +
    'clients.matchAll(), and matches final Client.');
 
@@ -142,5 +151,27 @@
 }, 'Initial about:blank is controlled, exposed to clients.matchAll(), and ' +
    'final Client is not controlled by a service worker.');
 
+promise_test(async function(t) {
+  // Execute a test where the nested frame is an iframe without a src
+  // attribute.  This simple nested about:blank should still inherit the
+  // controller and be visible to clients.matchAll().
+  await doAsyncTest(t, 'resources/about-blank-replacement-blank-nested-frame.html');
+}, 'Simple about:blank is controlled and is exposed to clients.matchAll().');
+
+promise_test(async function(t) {
+  // Execute a test where the nested frame is an iframe using a non-empty
+  // srcdoc containing only a tag pair so its textContent is still empty.
+  // This nested iframe should still inherit the controller and be visible
+  // to clients.matchAll().
+  await doAsyncTest(t, 'resources/about-blank-replacement-srcdoc-nested-frame.html');
+}, 'Nested about:srcdoc is controlled and is exposed to clients.matchAll().');
+
+promise_test(async function(t) {
+  // Execute a test where the nested frame is dynamically added without a src
+  // attribute.  This simple nested about:blank should still inherit the
+  // controller and be visible to clients.matchAll().
+  await doAsyncTest(t, 'resources/about-blank-replacement-blank-dynamic-nested-frame.html');
+}, 'Dynamic about:blank is controlled and is exposed to clients.matchAll().');
+
 </script>
 </body>
diff --git a/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html b/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html
new file mode 100644
index 00000000000000..1e0c6209bfc0bd
--- /dev/null
+++ b/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+<body>
+<script>
+function nestedLoaded() {
+  parent.postMessage({ type: 'NESTED_LOADED' }, '*');
+}
+
+// dynamically add an about:blank iframe
+var f = document.createElement('iframe');
+f.onload = nestedLoaded;
+document.body.appendChild(f);
+
+// Helper routine to make it slightly easier for our parent to find
+// the nested frame.
+function nested() {
+  return f.contentWindow;
+}
+</script>
+</body>
+</html>
diff --git a/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html b/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html
new file mode 100644
index 00000000000000..99d07a48cda5ea
--- /dev/null
+++ b/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<body>
+<script>
+function nestedLoaded() {
+  parent.postMessage({ type: 'NESTED_LOADED' }, '*');
+}
+</script>
+<iframe id="nested" onload="nestedLoaded()"></iframe>
+<script>
+// Helper routine to make it slightly easier for our parent to find
+// the nested frame.
+function nested() {
+  return document.getElementById('nested').contentWindow;
+}
+
+// NOTE: Make sure not to touch the iframe directly here.  We want to
+//       test the case where the initial about:blank document is not
+//       directly accessed before load.
+</script>
+</body>
+</html>
diff --git a/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html b/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html
new file mode 100644
index 00000000000000..0122a00aa432f9
--- /dev/null
+++ b/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<body>
+<script>
+function nestedLoaded() {
+  parent.postMessage({ type: 'NESTED_LOADED' }, '*');
+}
+</script>
+<iframe id="nested" srcdoc="<div></div>" onload="nestedLoaded()"></iframe>
+<script>
+// Helper routine to make it slightly easier for our parent to find
+// the nested frame.
+function nested() {
+  return document.getElementById('nested').contentWindow;
+}
+
+// NOTE: Make sure not to touch the iframe directly here.  We want to
+//       test the case where the initial about:blank document is not
+//       directly accessed before load.
+</script>
+</body>
+</html>

From f762127fc97ea4bfcdba15dd409bed1362996d38 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:15:29 +0000
Subject: [PATCH 20/26] part 2 - [css-ui] Add a 'text-overflow' web platform
 test. bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1403986
 gecko-commit: 47098bf648b46df0c3de105884421684dc4ace32
 gecko-integration-branch: central

---
 css/css-ui/text-overflow-026-ref.html | 62 +++++++++++++++++++++++++
 css/css-ui/text-overflow-026.html     | 67 +++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 css/css-ui/text-overflow-026-ref.html
 create mode 100644 css/css-ui/text-overflow-026.html

diff --git a/css/css-ui/text-overflow-026-ref.html b/css/css-ui/text-overflow-026-ref.html
new file mode 100644
index 00000000000000..f2db8c747fa8ac
--- /dev/null
+++ b/css/css-ui/text-overflow-026-ref.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>Reference: text-overflow with leading white-space</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1403986">
+  <style type="text/css">
+html,body {
+  color:black; background-color:white; font:16px/1 monospace;
+}
+
+.ellipsize {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100px;
+  border: 1px solid;
+}
+
+.inline-block {
+  display: inline-block;
+  background: red;
+}
+  </style>
+</head>
+<body>
+
+<pre>
+The test PASS if all of the following are true:
+1. there are no red areas
+2. the first two blocks display "PASS" but no ellipsis
+3. the last three blocks display an ellipsis
+</pre>
+
+<div class="ellipsize" style="text-overflow: clip">
+  <span style="margin-left:5px"></span><span class="inline-block" style="background:lime">
+    PASS PASS PASS PASS PASS</span>
+</div>
+
+<div class="ellipsize" style="text-overflow: clip">
+  <span style="margin-left:5px"></span>
+  <span class="inline-block" style="background:lime">
+    PASS PASS PASS PASS PASS</span>
+</div>
+
+<div class="ellipsize">
+  <span style="margin-left:10px"></span>&nbsp;&#x2026;
+</div>
+
+<div class="ellipsize">
+  &nbsp;&#x2026;
+</div>
+
+<div class="ellipsize">
+  a&#x2026;
+</div>
+
+</body>
+</html>
diff --git a/css/css-ui/text-overflow-026.html b/css/css-ui/text-overflow-026.html
new file mode 100644
index 00000000000000..2d1aa57cc8923f
--- /dev/null
+++ b/css/css-ui/text-overflow-026.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>Test: text-overflow with leading white-space</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1403986">
+  <link rel="help" href="https://www.w3.org/TR/css3-ui/#text-overflow" title="5.2. the 'text-overflow' property">
+  <link rel="match" href="text-overflow-026-ref.html">
+  <style type="text/css">
+html,body {
+  color:black; background-color:white; font:16px/1 monospace;
+}
+
+.ellipsize {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100px;
+  border: 1px solid;
+}
+
+.inline-block {
+  display: inline-block;
+  background: red;
+}
+  </style>
+</head>
+<body>
+
+<pre>
+The test PASS if all of the following are true:
+1. there are no red areas
+2. the first two blocks display "PASS" but no ellipsis
+3. the last three blocks display an ellipsis
+</pre>
+
+<div class="ellipsize">
+  <span style="margin-left:5px"></span><span class="inline-block" style="background:lime">
+    PASS PASS PASS PASS PASS</span>
+</div>
+
+<div class="ellipsize">
+  <span style="margin-left:5px"></span>
+  <span class="inline-block" style="background:lime">
+    PASS PASS PASS PASS PASS</span>
+</div>
+
+<div class="ellipsize">
+  <span style="margin-left:10px"></span>&nbsp;<span class="inline-block">
+    FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL </span>
+</div>
+
+<div class="ellipsize">
+  &nbsp;<span class="inline-block">
+    FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL </span>
+</div>
+
+<div class="ellipsize">
+  a<span class="inline-block">
+    FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL </span>
+</div>
+
+</body>
+</html>

From e32cf6a839fca2409a95e1a3bf4b61097083ec6f Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:13:37 +0000
Subject: [PATCH 21/26] Safely shutdown Firefox from in delete_session.

With the request to shutdown the browser, a given amount of time
has to be waited to allow the process to shutdown itself. Only
if the process is still running afterward it has to be killed.

Firefox has an integrated background monitor which observes
long running threads during shutdown, and kills those after
65s. To allow Firefox to shutdown on its own, geckodriver
has to wait that time, and some additional seconds.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1403923
gecko-commit: 025d4690bfbe602a82d91f827a67208df80dc110
gecko-integration-branch: central
gecko-reviewers: jgraham
---
 webdriver/tests/state/get_element_attribute.py | 2 ++
 webdriver/tests/state/get_element_property.py  | 2 ++
 webdriver/tests/state/get_element_tag_name.py  | 2 ++
 webdriver/tests/state/is_element_selected.py   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/webdriver/tests/state/get_element_attribute.py b/webdriver/tests/state/get_element_attribute.py
index 1301a45a73c5dd..ce78e11d3ff22b 100644
--- a/webdriver/tests/state/get_element_attribute.py
+++ b/webdriver/tests/state/get_element_attribute.py
@@ -1,3 +1,5 @@
+# META: timeout=long
+
 import pytest
 
 from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
diff --git a/webdriver/tests/state/get_element_property.py b/webdriver/tests/state/get_element_property.py
index c76c56104628c9..e4da98e0c3facc 100644
--- a/webdriver/tests/state/get_element_property.py
+++ b/webdriver/tests/state/get_element_property.py
@@ -1,3 +1,5 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
 from tests.support.inline import inline
 from tests.support.fixtures import create_dialog
diff --git a/webdriver/tests/state/get_element_tag_name.py b/webdriver/tests/state/get_element_tag_name.py
index 2dd7528bb2092e..e3ed83f3f20ec7 100644
--- a/webdriver/tests/state/get_element_tag_name.py
+++ b/webdriver/tests/state/get_element_tag_name.py
@@ -1,3 +1,5 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
 from tests.support.inline import inline
 from tests.support.fixtures import create_dialog
diff --git a/webdriver/tests/state/is_element_selected.py b/webdriver/tests/state/is_element_selected.py
index 392929a582864a..b51ba020fa4cc3 100644
--- a/webdriver/tests/state/is_element_selected.py
+++ b/webdriver/tests/state/is_element_selected.py
@@ -1,3 +1,5 @@
+# META: timeout=long
+
 from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
 from tests.support.inline import inline
 from tests.support.fixtures import create_dialog

From 75f14bc47925d6756c0133d701b7fdf83583e18e Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:15:02 +0000
Subject: [PATCH 22/26] Use classic pytest output style for WPT.

The upstream upgrade of pytest came with a new test progress
percentage feature that introduced a lot of unnecessary log output
in WPT wdspec tests.

This adds a pytest flag that reverts it to use the "classic" output
style, which does not have a test progress bar.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1429388
gecko-commit: 4f065bc82a465371aaa8b6dc0de9514cf6e859c8
gecko-integration-branch: central
gecko-reviewers: davehunt, jgraham
---
 tools/wptrunner/wptrunner/executors/pytestrunner/runner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py b/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
index a2b603dd04439f..61063f83bca3bb 100644
--- a/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
+++ b/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
@@ -58,6 +58,7 @@ def run(path, server_config, session_config, timeout=0):
                          "--showlocals",  # display contents of variables in local scope
                          "-p", "no:mozlog",  # use the WPT result recorder
                          "-p", "no:cacheprovider",  # disable state preservation across invocations
+                         "-o=console_output_style=classic",  # disable test progress bar
                          path],
                         plugins=[harness, subtests])
         except Exception as e:

From 0947439068033348d72fc3e02f7e248e252a7352 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:16:49 +0000
Subject: [PATCH 23/26] Explicitly drain all queues on exit,

The fact that the queues were not drained on exist seemed to cause an
intermittent failure where one process tried to write to a queue that
another had closed. Draining the queues explicitly should avoid this
and ensure we surface hidden problems in the log.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1400716
gecko-commit: 0ea252bf357c2ff56b9f0dcd6db6d094efc7a1e8
gecko-integration-branch: central
gecko-reviewers: maja_zf
---
 .../wptrunner/executors/executormarionette.py |  6 +++-
 tools/wptrunner/wptrunner/testrunner.py       | 29 +++++++++++++++----
 tools/wptrunner/wptrunner/wptlogging.py       |  7 ++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executormarionette.py b/tools/wptrunner/wptrunner/executors/executormarionette.py
index edea3f14aa4da4..ce45394839f510 100644
--- a/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -175,7 +175,11 @@ def wait(self):
             # This can happen if there was a crash
             return
         if socket_timeout:
-            self.marionette.timeout.script = socket_timeout / 2
+            try:
+                self.marionette.timeout.script = socket_timeout / 2
+            except (socket.error, IOError):
+                self.logger.debug("Socket closed")
+                return
 
         self.marionette.switch_to_window(self.runner_handle)
         while True:
diff --git a/tools/wptrunner/wptrunner/testrunner.py b/tools/wptrunner/wptrunner/testrunner.py
index 64418285e66f16..75f4825f95255c 100644
--- a/tools/wptrunner/wptrunner/testrunner.py
+++ b/tools/wptrunner/wptrunner/testrunner.py
@@ -120,6 +120,13 @@ def start_runner(runner_command_queue, runner_result_queue,
                  executor_browser_cls, executor_browser_kwargs,
                  stop_flag):
     """Launch a TestRunner in a new process"""
+    def log(level, msg):
+        runner_result_queue.put(("log", (level, {"message": msg})))
+
+    def handle_error(e):
+        log("critical", traceback.format_exc())
+        stop_flag.set()
+
     try:
         browser = executor_browser_cls(**executor_browser_kwargs)
         executor = executor_cls(browser, **executor_kwargs)
@@ -128,10 +135,10 @@ def start_runner(runner_command_queue, runner_result_queue,
                 runner.run()
             except KeyboardInterrupt:
                 stop_flag.set()
-    except Exception:
-        runner_result_queue.put(("log", ("critical", {"message": traceback.format_exc()})))
-        print >> sys.stderr, traceback.format_exc()
-        stop_flag.set()
+            except Exception as e:
+                handle_error(e)
+    except Exception as e:
+        handle_error(e)
     finally:
         runner_command_queue = None
         runner_result_queue = None
@@ -389,6 +396,7 @@ def wait_event(self):
         }
         try:
             command, data = self.command_queue.get(True, 1)
+            self.logger.debug("Got command: %r" % command)
         except IOError:
             self.logger.error("Got IOError from poll")
             return RunnerManagerState.restarting(0)
@@ -676,7 +684,18 @@ def cleanup(self):
             self.browser.cleanup()
         while True:
             try:
-                self.logger.warning(" ".join(map(repr, self.command_queue.get_nowait())))
+                cmd, data = self.command_queue.get_nowait()
+            except Empty:
+                break
+            else:
+                if cmd == "log":
+                     self.log(*data)
+                else:
+                    self.logger.warning("%r: %r" % (cmd, data))
+        while True:
+            try:
+                cmd, data = self.remote_queue.get_nowait()
+                self.logger.warning("%r: %r" % (cmd, data))
             except Empty:
                 break
 
diff --git a/tools/wptrunner/wptrunner/wptlogging.py b/tools/wptrunner/wptrunner/wptlogging.py
index 4d320617859c5b..2118458a4695fe 100644
--- a/tools/wptrunner/wptrunner/wptlogging.py
+++ b/tools/wptrunner/wptrunner/wptlogging.py
@@ -1,6 +1,7 @@
 import logging
 import sys
 import threading
+from Queue import Empty
 from StringIO import StringIO
 from multiprocessing import Queue
 
@@ -45,7 +46,6 @@ def __call__(self, data):
         return self.inner(data)
 
 
-
 class LogThread(threading.Thread):
     def __init__(self, queue, logger, level):
         self.queue = queue
@@ -120,5 +120,10 @@ def __exit__(self, *args, **kwargs):
                 self.logging_queue.put(None)
                 if self.logging_thread is not None:
                     self.logging_thread.join(10)
+                while not self.logging_queue.empty():
+                    try:
+                        self.logger.warning("Dropping log message: %r", self.logging_queue.get())
+                    except Exception:
+                        pass
                 self.logging_queue.close()
                 self.logger.info("queue closed")

From 4e7a87ef837a32900f35c573b288684930d82dd7 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 12:16:50 +0000
Subject: [PATCH 24/26] Fixup call to traceback, bugzilla-url:
 https://bugzilla-dev.allizom.org/show_bug.cgi?id=1400716 gecko-commit:
 38a8726fbde26796847294962cc9edd369091fee gecko-integration-branch: central
 gecko-reviewers: maja_zf

---
 tools/wptrunner/wptrunner/executors/executormarionette.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wptrunner/wptrunner/executors/executormarionette.py b/tools/wptrunner/wptrunner/executors/executormarionette.py
index ce45394839f510..2d0dc914d10566 100644
--- a/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -568,7 +568,7 @@ def teardown(self):
             self.executor.protocol.marionette.set_context(self.executor.protocol.marionette.CONTEXT_CONTENT)
         except Exception as e:
             # Ignore errors during teardown
-            self.logger.warning(traceback.traceback.format_exc(e))
+            self.logger.warning(traceback.format_exc(e))
 
 
 

From f3e215b4c299ee468c704a9a11a095a5cb91a4b5 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Thu, 11 Jan 2018 14:03:08 +0000
Subject: [PATCH 25/26] Remove obsolete optional parameter `reset_session_id`
 from `delete_session`.

By calling "delete_session" the currently used session id always has to be reset,
because each session has its own unique id.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1429562
gecko-commit: ec1a634f8feaa198469acf34f37d13e917175226
gecko-integration-branch: autoland
gecko-reviewers: ato
---
 tools/wptrunner/wptrunner/executors/executormarionette.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wptrunner/wptrunner/executors/executormarionette.py b/tools/wptrunner/wptrunner/executors/executormarionette.py
index 2d0dc914d10566..e9850dfa419137 100644
--- a/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -96,7 +96,7 @@ def setup(self, runner):
     def teardown(self):
         try:
             self.marionette._request_in_app_shutdown()
-            self.marionette.delete_session(send_request=False, reset_session_id=True)
+            self.marionette.delete_session(send_request=False)
         except Exception:
             # This is typically because the session never started
             pass

From ca5113e4e6a3ba2767bcdc707c736d685c9d94a7 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Fri, 12 Jan 2018 16:56:09 +0000
Subject: [PATCH 26/26] Make WebDriver:ElementClear conforming to standard.

This implements the remote end steps for the Element Clear command
from WebDriver in Marionette.

The WPT test webdriver/tests/interaction/element_clear.py was deleted
because it tested a previous definition of the Element Clear command
and many of its tests were either incorrect or replaced by the new tests.
bugzilla-url: https://bugzilla-dev.allizom.org/show_bug.cgi?id=1354211
gecko-commit: f9f835bce31b7a0f40c2a8e69b83cf8aaf4b4024
gecko-integration-branch: autoland
gecko-reviewers: automatedtester
---
 webdriver/tests/interaction/element_clear.py | 438 +++++++++++++------
 1 file changed, 308 insertions(+), 130 deletions(-)

diff --git a/webdriver/tests/interaction/element_clear.py b/webdriver/tests/interaction/element_clear.py
index f9755f784e52bd..546dc18ef39584 100644
--- a/webdriver/tests/interaction/element_clear.py
+++ b/webdriver/tests/interaction/element_clear.py
@@ -1,185 +1,363 @@
 import pytest
+
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
 
 
-def clear(session, element):
-    return session.transport.send("POST", "session/{session_id}/element/{element_id}/clear"
-                                  .format(session_id=session.session_id,
-                                          element_id=element.id))
+@pytest.fixture(scope="session")
+def text_file(tmpdir_factory):
+    fh = tmpdir_factory.mktemp("tmp").join("hello.txt")
+    fh.write("hello")
+    return fh
 
 
-# 14.2 Element Clear
+def element_clear(session, element):
+    return session.transport.send("POST", "/session/%s/element/%s/clear" %
+                                  (session.session_id, element.id))
 
-def test_no_browsing_context(session, create_window):
-    # 14.2 step 1
-    session.url = inline("<p>This is not an editable paragraph.")
-    element = session.find.css("p", all=False)
 
-    session.window_handle = create_window()
+def test_closed_context(session, create_window):
+    new_window = create_window()
+    session.window_handle = new_window
+    session.url = inline("<input>")
+    element = session.find.css("input", all=False)
     session.close()
 
-    response = clear(session, element)
+    response = element_clear(session, element)
     assert_error(response, "no such window")
 
 
-def test_element_not_found(session):
-    # 14.2 Step 2
-    response = session.transport.send("POST", "session/{session_id}/element/{element_id}/clear"
-                                      .format(session_id=session.session_id,
-                                              element_id="box1"))
+def test_connected_element(session):
+    session.url = inline("<input>")
+    element = session.find.css("input", all=False)
 
-    assert_error(response, "no such element")
+    session.url = inline("<input>")
+    response = element_clear(session, element)
+    assert_error(response, "stale element reference")
 
 
-def test_element_not_editable(session):
-    # 14.2 Step 3
-    session.url = inline("<p>This is not an editable paragraph.")
+def test_pointer_interactable(session):
+    session.url = inline("<input style='margin-left: -1000px' value=foobar>")
+    element = session.find.css("input", all=False)
 
-    element = session.find.css("p", all=False)
-    response = clear(session, element)
-    assert_error(response, "invalid element state")
+    response = element_clear(session, element)
+    assert_error(response, "element not interactable")
 
 
-def test_button_element_not_resettable(session):
-    # 14.2 Step 3
-    session.url = inline("<input type=button value=Federer>")
+def test_keyboard_interactable(session):
+    session.url = inline("""
+        <input value=foobar>
+        <div></div>
 
+        <style>
+        div {
+          position: absolute;
+          background: blue;
+          top: 0;
+        }
+        </style>
+        """)
     element = session.find.css("input", all=False)
-    response = clear(session, element)
-    assert_error(response, "invalid element state")
+    assert element.property("value") == "foobar"
 
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("value") == ""
+
+
+@pytest.mark.parametrize("type,value,default",
+                         [("number", "42", ""),
+                          ("range", "42", "50"),
+                          ("email", "foo@example.com", ""),
+                          ("password", "password", ""),
+                          ("search", "search", ""),
+                          ("tel", "999", ""),
+                          ("text", "text", ""),
+                          ("url", "https://example.com/", ""),
+                          ("color", "#ff0000", "#000000"),
+                          ("date", "2017-12-26", ""),
+                          ("datetime", "2017-12-26T19:48", ""),
+                          ("datetime-local", "2017-12-26T19:48", ""),
+                          ("time", "19:48", ""),
+                          ("month", "2017-11", ""),
+                          ("week", "2017-W52", "")])
+def test_input(session, type, value, default):
+    session.url = inline("<input type=%s value='%s'>" % (type, value))
+    element = session.find.css("input", all=False)
+    assert element.property("value") == value
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("value") == default
+
+
+@pytest.mark.parametrize("type",
+                         ["number",
+                          "range",
+                          "email",
+                          "password",
+                          "search",
+                          "tel",
+                          "text",
+                          "url",
+                          "color",
+                          "date",
+                          "datetime",
+                          "datetime-local",
+                          "time",
+                          "month",
+                          "week",
+                          "file"])
+def test_input_disabled(session, type):
+    session.url = inline("<input type=%s disabled>" % type)
+    element = session.find.css("input", all=False)
+
+    response = element_clear(session, element)
+    assert_error(response, "invalid element state")
 
-def test_disabled_element_not_resettable(session):
-    # 14.2 Step 3
-    session.url = inline("<input type=text value=Federer disabled>")
 
+@pytest.mark.parametrize("type",
+                         ["number",
+                          "range",
+                          "email",
+                          "password",
+                          "search",
+                          "tel",
+                          "text",
+                          "url",
+                          "color",
+                          "date",
+                          "datetime",
+                          "datetime-local",
+                          "time",
+                          "month",
+                          "week",
+                          "file"])
+def test_input_readonly(session, type):
+    session.url = inline("<input type=%s readonly>" % type)
     element = session.find.css("input", all=False)
-    response = clear(session, element)
+
+    response = element_clear(session, element)
     assert_error(response, "invalid element state")
 
 
-def test_scroll_into_element_view(session):
-    # 14.2 Step 4
-    session.url = inline("<input type=text value=Federer><div style= \"height: 200vh; width: 5000vh\">")
+def test_textarea(session):
+    session.url = inline("<textarea>foobar</textarea>")
+    element = session.find.css("textarea", all=False)
+    assert element.property("value") == "foobar"
 
-    # Scroll to the bottom right of the page
-    session.execute_script("window.scrollTo(document.body.scrollWidth, document.body.scrollHeight);")
-    element = session.find.css("input", all=False)
-    # Clear and scroll back to the top of the page
-    response = clear(session, element)
+    response = element_clear(session, element)
     assert_success(response)
+    assert element.property("value") == ""
 
-    # Check if element cleared is scrolled into view
-    rect = session.execute_script("return document.getElementsByTagName(\"input\")[0].getBoundingClientRect()")
 
-    pageDict = {}
+def test_textarea_disabled(session):
+    session.url = inline("<textarea disabled></textarea>")
+    element = session.find.css("textarea", all=False)
 
-    pageDict["innerHeight"] = session.execute_script("return window.innerHeight")
-    pageDict["innerWidth"] = session.execute_script("return window.innerWidth")
-    pageDict["pageXOffset"] = session.execute_script("return window.pageXOffset")
-    pageDict["pageYOffset"] = session.execute_script("return window.pageYOffset")
+    response = element_clear(session, element)
+    assert_error(response, "invalid element state")
 
-    assert rect["top"] < (pageDict["innerHeight"] + pageDict["pageYOffset"]) and \
-           rect["left"] < (pageDict["innerWidth"] + pageDict["pageXOffset"]) and \
-           (rect["top"] + element.rect["height"]) > pageDict["pageYOffset"] and \
-           (rect["left"] + element.rect["width"]) > pageDict["pageXOffset"]
 
+def test_textarea_readonly(session):
+    session.url = inline("<textarea readonly></textarea>")
+    element = session.find.css("textarea", all=False)
 
-# TODO
-# Any suggestions on implementation?
-# def test_session_implicit_wait_timeout(session):
-    # 14.2 Step 5
+    response = element_clear(session, element)
+    assert_error(response, "invalid element state")
 
-# TODO
-# Any suggestions on implementation?
-# def test_element_not_interactable(session):
-#     # 14.2 Step 6
-#     assert_error(response, "element not interactable")
 
+def test_input_file(session, text_file):
+    session.url = inline("<input type=file>")
+    element = session.find.css("input", all=False)
+    element.send_keys(str(text_file))
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("value") == ""
 
-def test_element_readonly(session):
-    # 14.2 Step 7
-    session.url = inline("<input type=text readonly value=Federer>")
 
+def test_input_file_multiple(session, text_file):
+    session.url = inline("<input type=file multiple>")
     element = session.find.css("input", all=False)
-    response = clear(session, element)
+    element.send_keys(str(text_file))
+    element.send_keys(str(text_file))
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("value") == ""
+
+
+def test_select(session):
+    session.url = inline("""
+        <select disabled>
+          <option>foo
+        </select>
+        """)
+    select = session.find.css("select", all=False)
+    option = session.find.css("option", all=False)
+
+    response = element_clear(session, select)
+    assert_error(response, "invalid element state")
+    response = element_clear(session, option)
     assert_error(response, "invalid element state")
 
 
-def test_element_disabled(session):
-    # 14.2 Step 7
-    session.url = inline("<input type=text disabled value=Federer>")
+def test_button(session):
+    session.url = inline("<button></button>")
+    button = session.find.css("button", all=False)
 
-    element = session.find.css("input", all=False)
-    response = clear(session, element)
+    response = element_clear(session, button)
     assert_error(response, "invalid element state")
 
 
-def test_element_pointer_events_disabled(session):
-    # 14.2 Step 7
-    session.url = inline("<input type=text value=Federer style=\"pointer-events: none\">")
+def test_button_with_subtree(session):
+    """
+    Whilst an <input> is normally editable, the focusable area
+    where it is placed will default to the <button>.  I.e. if you
+    try to click <input> to focus it, you will hit the <button>.
+    """
+    session.url = inline("""
+        <button>
+          <input value=foobar>
+        </button>
+        """)
+    text_field = session.find.css("input", all=False)
 
+    response = element_clear(session, text_field)
+    assert_error(response, "element not interactable")
+
+
+def test_contenteditable(session):
+    session.url = inline("<p contenteditable>foobar</p>")
+    element = session.find.css("p", all=False)
+    assert element.property("innerHTML") == "foobar"
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("innerHTML") == ""
+
+
+def test_contenteditable_focus(session):
+    session.url = inline("""
+        <p contenteditable>foobar</p>
+
+        <script>
+        window.events = [];
+        let p = document.querySelector("p");
+        for (let ev of ["focus", "blur"]) {
+          p.addEventListener(ev, ({type}) => window.events.push(type));
+        }
+        </script>
+        """)
+    element = session.find.css("p", all=False)
+    assert element.property("innerHTML") == "foobar"
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("innerHTML") == ""
+    assert session.execute_script("return window.events") == ["focus", "blur"]
+
+
+def test_designmode(session):
+    session.url = inline("foobar")
+    element = session.find.css("body", all=False)
+    assert element.property("innerHTML") == "foobar"
+    session.execute_script("document.designMode = 'on'")
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("innerHTML") == "<br>"
+
+
+def test_resettable_element_focus(session):
+    session.url = inline("""
+        <input value="foobar">
+
+        <script>
+        window.events = [];
+        let input = document.querySelector("input");
+        for (let ev of ["focus", "blur"]) {
+          input.addEventListener(ev, ({type}) => window.events.push(type));
+        }
+        </script>
+        """)
+    element = session.find.css("input", all=False)
+    assert element.property("value") == "foobar"
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("value") == ""
+    assert session.execute_script("return window.events") == ["focus", "blur"]
+
+
+def test_resettable_element_focus_when_empty(session):
+    session.url = inline("""
+        <input>
+
+        <script>
+        window.events = [];
+        let p = document.querySelector("input");
+        for (let ev of ["focus", "blur"]) {
+          p.addEventListener(ev, ({type}) => window.events.push(type));
+        }
+        </script>
+        """)
     element = session.find.css("input", all=False)
-    response = clear(session, element)
+    assert element.property("value") == ""
+
+    response = element_clear(session, element)
+    assert_success(response)
+    assert element.property("value") == ""
+    assert session.execute_script("return window.events") == []
+
+
+@pytest.mark.parametrize("type",
+                         ["checkbox",
+                          "radio",
+                          "hidden",
+                          "submit",
+                          "button",
+                          "image"])
+def test_non_editable_inputs(session, type):
+    session.url = inline("<input type=%s>" % type)
+    element = session.find.css("input", all=False)
+
+    response = element_clear(session, element)
     assert_error(response, "invalid element state")
 
 
-@pytest.mark.parametrize("element", [["text", "<input id=text type=text value=\"Federer\"><input id=empty type=text value=\"\">"],
-                                    ["search", "<input id=search type=search value=\"Federer\"><input id=empty type=search value=\"\">"],
-                                    ["url", "<input id=url type=url value=\"www.hello.com\"><input id=empty type=url value=\"\">"],
-                                    ["tele", "<input id=tele type=telephone value=\"2061234567\"><input id=empty type=telephone value=\"\">"],
-                                    ["email", "<input id=email type=email value=\"hello@world.com\"><input id=empty type=email value=\"\">"],
-                                    ["password", "<input id=password type=password value=\"pass123\"><input id=empty type=password value=\"\">"],
-                                    ["date", "<input id=date type=date value=\"2017-12-25\"><input id=empty type=date value=\"\">"],
-                                    ["time", "<input id=time type=time value=\"11:11\"><input id=empty type=time value=\"\">"],
-                                    ["number", "<input id=number type=number value=\"19\"><input id=empty type=number value=\"\">"],
-                                    ["range", "<input id=range type=range min=\"0\" max=\"10\"><input id=empty type=range value=\"\">"],
-                                    ["color", "<input id=color type=color value=\"#ff0000\"><input id=empty type=color value=\"\">"],
-                                    ["file", "<input id=file type=file value=\"C:\\helloworld.txt\"><input id=empty type=file value=\"\">"],
-                                    ["textarea", "<textarea id=textarea>Hello World</textarea><textarea id=empty></textarea>"],
-                                    ["sel", "<select id=sel><option></option><option>a</option><option>b</option></select><select id=empty><option></option></select>"],
-                                    ["out", "<output id=out value=100></output><output id=empty></output>"],
-                                    ["para", "<p id=para contenteditable=true>This is an editable paragraph.</p><p id=empty contenteditable=true></p>"]])
-
-def test_clear_content_editable_resettable_element(session, element):
-    # 14.2 Step 8
-    url = element[1] + """<input id=focusCheck type=checkbox>
-                    <input id=blurCheck type=checkbox>
-                    <script>
-                    var id = "%s";
-                    document.getElementById(id).addEventListener("focus", checkFocus);
-                    document.getElementById(id).addEventListener("blur", checkBlur);
-                    document.getElementById("empty").addEventListener("focus", checkFocus);
-                    document.getElementById("empty").addEventListener("blur", checkBlur);
-
-                    function checkFocus() {
-                        document.getElementById("focusCheck").checked = true;
-                    }
-                    function checkBlur() {
-                        document.getElementById("blurCheck").checked = true;
-                    }
-                    </script>""" % element[0]
-    session.url = inline(url)
-    # Step 1
-    empty_element = session.find.css("#empty", all=False)
-    clear_element_test_helper(session, empty_element, False)
-    session.execute_script("document.getElementById(\"focusCheck\").checked = false;")
-    session.execute_script("document.getElementById(\"blurCheck\").checked = false;")
-    # Step 2 - 4
-    test_element = session.find.css("#" + element[0], all=False)
-    clear_element_test_helper(session, test_element, True)
-
-
-def clear_element_test_helper(session, element, value):
-    response = clear(session, element)
+def test_scroll_into_view(session):
+    session.url = inline("""
+        <input value=foobar>
+        <div style='height: 200vh; width: 5000vh'>
+        """)
+    element = session.find.css("input", all=False)
+    assert element.property("value") == "foobar"
+    assert session.execute_script("return window.scrollY") == 0
+
+    # scroll to the bottom right of the page
+    session.execute_script("""
+        let {scrollWidth, scrollHeight} = document.body;
+        window.scrollTo(scrollWidth, scrollHeight);
+        """)
+
+    # clear and scroll back to the top of the page
+    response = element_clear(session, element)
     assert_success(response)
-    response = session.execute_script("return document.getElementById(\"focusCheck\").checked;")
-    assert response is value
-    response = session.execute_script("return document.getElementById(\"blurCheck\").checked;")
-    assert response is value
-    if element.name == "p":
-        response = session.execute_script("return document.getElementById(\"para\").innerHTML;")
-        assert response == ""
-    else:
-        assert element.property("value") == ""
+    assert element.property("value") == ""
+
+    # check if element cleared is scrolled into view
+    rect = session.execute_script("""
+        let [input] = arguments;
+        return input.getBoundingClientRect();
+        """, args=(element,))
+    window = session.execute_script("""
+        let {innerHeight, innerWidth, pageXOffset, pageYOffset} = window;
+        return {innerHeight, innerWidth, pageXOffset, pageYOffset};
+        """)
+
+    assert rect["top"] < (window["innerHeight"] + window["pageYOffset"]) and \
+           rect["left"] < (window["innerWidth"] + window["pageXOffset"]) and \
+           (rect["top"] + element.rect["height"]) > window["pageYOffset"] and \
+           (rect["left"] + element.rect["width"]) > window["pageXOffset"]