Auto merge of #7876 - jgraham:wpt-upgrade, r=Ms2ger

Update web-platform-tests to revision 7da6acfd668e66adae5ab4e2d389810d3b1460be



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7876)
<!-- Reviewable:end -->

tests/wpt/harness/wptrunner/browsers/firefox.py

@@ -53,8 +53,14 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, **kwargs)
     executor_kwargs["close_after_done"] = True
-    if run_info_data["debug"] and kwargs["timeout_multiplier"] is None:
+    if kwargs["timeout_multiplier"] is None:
-        executor_kwargs["timeout_multiplier"] = 3
+        if kwargs["gecko_e10s"] and test_type == "reftest":
+            if run_info_data["debug"]:
+                executor_kwargs["timeout_multiplier"] = 4
+            else:
+                executor_kwargs["timeout_multiplier"] = 2
+        elif run_info_data["debug"]:
+            executor_kwargs["timeout_multiplier"] = 3
     return executor_kwargs
 
 

tests/wpt/harness/wptrunner/browsers/servo.py

@@ -37,8 +37,10 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
     rv["pause_after_test"] = kwargs["pause_after_test"]
     return rv
 
+
 def env_options():
-    return {"host": "localhost",
+    return {"host": "127.0.0.1",
+            "external_host": "web-platform.test",
             "bind_hostname": "true",
             "testharnessreport": "testharnessreport-servo.js",
             "supports_debugger": True}

tests/wpt/harness/wptrunner/browsers/servodriver.py

@@ -49,7 +49,8 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data, **kw
 
 
 def env_options():
-    return {"host": "web-platform.test",
+    return {"host": "127.0.0.1",
+            "external_host": "web-platform.test",
             "bind_hostname": "true",
             "testharnessreport": "testharnessreport-servodriver.js",
             "supports_debugger": True}

tests/wpt/harness/wptrunner/executors/executorservodriver.py

@@ -36,7 +36,8 @@ class ServoWebDriverProtocol(Protocol):
 
         session_started = False
         try:
-            self.session = webdriver.Session(self.host, self.port)
+            self.session = webdriver.Session(self.host, self.port,
+                                             extension=webdriver.ServoExtensions)
             self.session.start()
         except:
             self.logger.warning(
@@ -82,6 +83,11 @@ class ServoWebDriverProtocol(Protocol):
                 self.logger.error(traceback.format_exc(e))
                 break
 
+    def on_environment_change(self, old_environment, new_environment):
+        #Unset all the old prefs
+        self.session.extension.reset_prefs(*old_environment.get("prefs", {}).keys())
+        self.session.extension.set_prefs(new_environment.get("prefs", {}))
+
 
 class ServoWebDriverRun(object):
     def __init__(self, func, session, url, timeout, current_timeout=None):

tests/wpt/harness/wptrunner/executors/webdriver.py

@@ -346,7 +346,8 @@ class Find(object):
 
 
 class Session(object):
-    def __init__(self, host, port, url_prefix="", desired_capabilities=None, port_timeout=60):
+    def __init__(self, host, port, url_prefix="", desired_capabilities=None, port_timeout=60,
+                 extension=None):
         self.transport = Transport(host, port, url_prefix, port_timeout)
         self.desired_capabilities = desired_capabilities
         self.session_id = None
@@ -354,6 +355,8 @@ class Session(object):
         self.window = None
         self.find = None
         self._element_cache = {}
+        self.extension = None
+        self.extension_cls = extension
 
     def start(self):
         desired_capabilities = self.desired_capabilities if self.desired_capabilities else {}
@@ -365,6 +368,8 @@ class Session(object):
         self.timeouts = Timeouts(self)
         self.window = Window(self)
         self.find = Find(self)
+        if self.extension_cls:
+            self.extension = self.extension_cls(self)
 
         return rv["value"]
 
@@ -376,6 +381,7 @@ class Session(object):
         self.timeouts = None
         self.window = None
         self.find = None
+        self.extension = None
         self.transport.close_connection()
 
     def __enter__(self):
@@ -579,9 +585,37 @@ class Element(object):
     @property
     @command
     def text(self):
-        return self.session.send_command("GET", self.url("text"), key="value")
+        return self.session.send_command("GET", self.url("text"))
 
     @property
     @command
     def name(self):
-        return self.session.send_command("GET", self.url("name"), key="value")
+        return self.session.send_command("GET", self.url("name"))
+
+    @command
+    def css(self, property_name):
+        return self.session.send_command("GET", self.url("css/%s" % property_name))
+
+    @property
+    @command
+    def rect(self):
+        return self.session.send_command("GET", self.url("rect"))
+
+class ServoExtensions(object):
+    def __init__(self, session):
+        self.session = session
+
+    @command
+    def get_prefs(self, *prefs):
+        body = {"prefs": list(prefs)}
+        return self.session.send_command("POST", "servo/prefs/get", body)
+
+    @command
+    def set_prefs(self, prefs):
+        body = {"prefs": prefs}
+        return self.session.send_command("POST", "servo/prefs/set", body)
+
+    @command
+    def reset_prefs(self, *prefs):
+        body = {"prefs": list(prefs)}
+        return self.session.send_command("POST", "servo/prefs/reset", body)

tests/wpt/harness/wptrunner/testrunner.py

@@ -199,6 +199,7 @@ class TestRunnerManager(threading.Thread):
 
         self.browser = None
         self.browser_pid = None
+        self.browser_started = False
 
         # Flags used to shut down this thread if we get a sigint
         self.parent_stop_flag = stop_flag
@@ -279,6 +280,10 @@ class TestRunnerManager(threading.Thread):
                         if commands[command](*data) is Stop:
                             break
                     else:
+                        if (self.debug_info and self.debug_info.interactive and
+                            self.browser_started and not browser.is_alive()):
+                            self.logger.debug("Debugger exited")
+                            break
                         if not self.test_runner_proc.is_alive():
                             if not self.command_queue.empty():
                                 # We got a new message so process that
@@ -355,6 +360,7 @@ class TestRunnerManager(threading.Thread):
                 succeeded = False
             else:
                 succeeded = True
+                self.browser_started = True
 
         # This has to happen after the lock is released
         if not succeeded:
@@ -457,6 +463,7 @@ class TestRunnerManager(threading.Thread):
             return
         try:
             self.browser.stop()
+            self.browser_started = False
             if self.test_runner_proc.is_alive():
                 self.send_message("stop")
                 self.ensure_runner_stopped()

tests/wpt/harness/wptrunner/update/tree.py

@@ -274,6 +274,8 @@ class GitTree(object):
         :param branch: Branch name to use
         :param force: Force-checkout
         """
+        assert rev is not None
+
         args = []
         if branch:
             branches = [ref[len("refs/heads/"):] for sha1, ref in self.list_refs()

tests/wpt/metadata/MANIFEST.json

@@ -269,6 +269,30 @@
         "path": "html-media-capture/capture_video_cancel-manual.html",
         "url": "/html-media-capture/capture_video_cancel-manual.html"
       },
+      {
+        "path": "html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html",
+        "url": "/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html",
+        "url": "/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html",
+        "url": "/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html",
+        "url": "/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html",
+        "url": "/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html",
+        "url": "/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html"
+      },
       {
         "path": "html/browsers/offline/application-cache-api/api_status_checking-manual.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_checking-manual.html"
@@ -337,6 +361,14 @@
         "path": "html/browsers/offline/section_network_online-manual.html",
         "url": "/html/browsers/offline/section_network_online-manual.html"
       },
+      {
+        "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html",
+        "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html",
+        "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html"
+      },
       {
         "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-locationbar-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-locationbar-manual.html"
@@ -12251,6 +12283,10 @@
         "path": "content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html",
         "url": "/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html"
       },
+      {
+        "path": "content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html",
+        "url": "/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html"
+      },
       {
         "path": "content-security-policy/blink-contrib-2/scripthash-allowed.sub.html",
         "url": "/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html"
@@ -12259,6 +12295,10 @@
         "path": "content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html",
         "url": "/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html"
       },
+      {
+        "path": "content-security-policy/blink-contrib-2/scripthash-default-src.sub.html",
+        "url": "/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html"
+      },
       {
         "path": "content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html",
         "url": "/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html"
@@ -13987,6 +14027,10 @@
         "path": "domxpath/evaluator-constructor.html",
         "url": "/domxpath/evaluator-constructor.html"
       },
+      {
+        "path": "domxpath/xml_xpath_runner.html",
+        "url": "/domxpath/xml_xpath_runner.html"
+      },
       {
         "path": "editing/event.html",
         "url": "/editing/event.html"
@@ -14527,10 +14571,122 @@
         "path": "html-media-capture/idlharness.html",
         "url": "/html-media-capture/idlharness.html"
       },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/001.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/001.html"
+      },
       {
         "path": "html/browsers/browsing-the-web/history-traversal/PopStateEvent.html",
         "url": "/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html"
       },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/browsing_context_name.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/events.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/events.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/hashchange_event.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/hashchange_event.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/popstate_event.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/popstate_event.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/history-traversal/unset_context_name-1.html",
+        "url": "/html/browsers/browsing-the-web/history-traversal/unset_context_name-1.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/001.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/001.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/002.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/002.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/003.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/003.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/004.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/004.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/005.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/005.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/006.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/006.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/007.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/007.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/008.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/008.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/009.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/009.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/010.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/010.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/011.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/011.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/012.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/012.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/013.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/013.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/014.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/014.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/015.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/015.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin.html",
+        "url": "/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin.html"
+      },
       {
         "path": "html/browsers/browsing-the-web/read-media/pageload-image.html",
         "url": "/html/browsers/browsing-the-web/read-media/pageload-image.html"
@@ -14543,6 +14699,34 @@
         "path": "html/browsers/browsing-the-web/read-text/load-text-plain.html",
         "url": "/html/browsers/browsing-the-web/read-text/load-text-plain.html"
       },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/001.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/001.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/002.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/002.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/003.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/003.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/004.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/004.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/005.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/005.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/006.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/006.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
+      },
       {
         "path": "html/browsers/browsing-the-web/unloading-documents/001.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/001.html"
@@ -14563,6 +14747,66 @@
         "path": "html/browsers/browsing-the-web/unloading-documents/005.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/005.html"
       },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/prompt/001.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/prompt/001.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/prompt/002.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/prompt/002.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/prompt/003.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/prompt/003.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/001.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/001.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/002.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/002.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/003.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/003.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/004.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/004.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/006.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/006.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/007.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/007.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/008.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/008.html"
+      },
+      {
+        "path": "html/browsers/browsing-the-web/unloading-documents/unload/009.html",
+        "url": "/html/browsers/browsing-the-web/unloading-documents/unload/009.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/001.html",
         "url": "/html/browsers/history/the-history-interface/001.html"
@@ -14635,18 +14879,38 @@
         "path": "html/browsers/history/the-history-interface/history_back.html",
         "url": "/html/browsers/history/the-history-interface/history_back.html"
       },
+      {
+        "path": "html/browsers/history/the-history-interface/history_back_1.html",
+        "url": "/html/browsers/history/the-history-interface/history_back_1.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/history_forward.html",
         "url": "/html/browsers/history/the-history-interface/history_forward.html"
       },
+      {
+        "path": "html/browsers/history/the-history-interface/history_forward_1.html",
+        "url": "/html/browsers/history/the-history-interface/history_forward_1.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/history_go_minus.html",
         "url": "/html/browsers/history/the-history-interface/history_go_minus.html"
       },
+      {
+        "path": "html/browsers/history/the-history-interface/history_go_no_argument.html",
+        "url": "/html/browsers/history/the-history-interface/history_go_no_argument.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/history_go_plus.html",
         "url": "/html/browsers/history/the-history-interface/history_go_plus.html"
       },
+      {
+        "path": "html/browsers/history/the-history-interface/history_go_undefined.html",
+        "url": "/html/browsers/history/the-history-interface/history_go_undefined.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/history_go_zero.html",
+        "url": "/html/browsers/history/the-history-interface/history_go_zero.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/history_pushstate.html",
         "url": "/html/browsers/history/the-history-interface/history_pushstate.html"
@@ -14675,6 +14939,70 @@
         "path": "html/browsers/history/the-history-interface/history_state.html",
         "url": "/html/browsers/history/the-history-interface/history_state.html"
       },
+      {
+        "path": "html/browsers/history/the-history-interface/joint_session_history/001.html",
+        "url": "/html/browsers/history/the-history-interface/joint_session_history/001.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/joint_session_history/002.html",
+        "url": "/html/browsers/history/the-history-interface/joint_session_history/002.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1.html",
+        "url": "/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_1.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_1.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_2.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_2.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_3.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_3.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_4.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_4.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_5.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_5.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_unload_1.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html"
+      },
+      {
+        "path": "html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html",
+        "url": "/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/assign_after_load.html",
+        "url": "/html/browsers/history/the-location-interface/assign_after_load.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/assign_before_load.html",
+        "url": "/html/browsers/history/the-location-interface/assign_before_load.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/document_location.html",
+        "url": "/html/browsers/history/the-location-interface/document_location.html"
+      },
       {
         "path": "html/browsers/history/the-location-interface/location-stringifier.html",
         "url": "/html/browsers/history/the-location-interface/location-stringifier.html"
@@ -14683,6 +15011,10 @@
         "path": "html/browsers/history/the-location-interface/location_assign.html",
         "url": "/html/browsers/history/the-location-interface/location_assign.html"
       },
+      {
+        "path": "html/browsers/history/the-location-interface/location_assign_about_blank.html",
+        "url": "/html/browsers/history/the-location-interface/location_assign_about_blank.html"
+      },
       {
         "path": "html/browsers/history/the-location-interface/location_hash.html",
         "url": "/html/browsers/history/the-location-interface/location_hash.html"
@@ -14723,6 +15055,38 @@
         "path": "html/browsers/history/the-location-interface/location_search.html",
         "url": "/html/browsers/history/the-location-interface/location_search.html"
       },
+      {
+        "path": "html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load.html",
+        "url": "/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/reload_document_open_write.html",
+        "url": "/html/browsers/history/the-location-interface/reload_document_open_write.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/reload_document_write.html",
+        "url": "/html/browsers/history/the-location-interface/reload_document_write.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/reload_document_write_onload.html",
+        "url": "/html/browsers/history/the-location-interface/reload_document_write_onload.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/reload_post_1.html",
+        "url": "/html/browsers/history/the-location-interface/reload_post_1.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/scripted_click_assign_during_load.html",
+        "url": "/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html",
+        "url": "/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html"
+      },
+      {
+        "path": "html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html",
+        "url": "/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html"
+      },
       {
         "path": "html/browsers/history/the-location-interface/security_location_0.sub.htm",
         "url": "/html/browsers/history/the-location-interface/security_location_0.sub.htm"
@@ -14783,10 +15147,42 @@
         "path": "html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html",
         "url": "/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html"
       },
+      {
+        "path": "html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html",
+        "url": "/html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html",
+        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html",
+        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html",
+        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html"
+      },
       {
         "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
         "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
       },
+      {
+        "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html",
+        "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html",
+        "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html",
+        "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html"
+      },
+      {
+        "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html",
+        "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html"
+      },
       {
         "path": "html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html",
         "url": "/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html"
@@ -14827,6 +15223,14 @@
         "path": "html/browsers/windows/browsing-context-first-created.xhtml",
         "url": "/html/browsers/windows/browsing-context-first-created.xhtml"
       },
+      {
+        "path": "html/browsers/windows/browsing-context-names/001.html",
+        "url": "/html/browsers/windows/browsing-context-names/001.html"
+      },
+      {
+        "path": "html/browsers/windows/browsing-context-names/002.html",
+        "url": "/html/browsers/windows/browsing-context-names/002.html"
+      },
       {
         "path": "html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html",
         "url": "/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html"
@@ -14851,6 +15255,10 @@
         "path": "html/browsers/windows/nested-browsing-contexts/frameElement.sub.html",
         "url": "/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html"
       },
+      {
+        "path": "html/browsers/windows/nested-browsing-contexts/window-top-001.html",
+        "url": "/html/browsers/windows/nested-browsing-contexts/window-top-001.html"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html",
         "url": "/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html"
@@ -18239,10 +18647,6 @@
         "path": "js/builtins/WeakMap.prototype-properties.html",
         "url": "/js/builtins/WeakMap.prototype-properties.html"
       },
-      {
-        "path": "media-source/SourceBuffer-abort-readyState.html",
-        "url": "/media-source/SourceBuffer-abort-readyState.html"
-      },
       {
         "path": "media-source/SourceBuffer-abort-removed.html",
         "url": "/media-source/SourceBuffer-abort-removed.html"
@@ -20415,6 +20819,10 @@
         "path": "pointerevents/pointerevent_constructor.html",
         "url": "/pointerevents/pointerevent_constructor.html"
       },
+      {
+        "path": "pointerevents/pointerevent_pointermove-on-chorded-mouse-button.html",
+        "url": "/pointerevents/pointerevent_pointermove-on-chorded-mouse-button.html"
+      },
       {
         "path": "pointerevents/pointerevent_touch-action-illegal.html",
         "url": "/pointerevents/pointerevent_touch-action-illegal.html"
@@ -25167,6 +25575,18 @@
         "path": "selectors/attribute-selectors/attribute-case/syntax.html",
         "url": "/selectors/attribute-selectors/attribute-case/syntax.html"
       },
+      {
+        "path": "shadow-dom/Element-interface-attachShadow.html",
+        "url": "/shadow-dom/Element-interface-attachShadow.html"
+      },
+      {
+        "path": "shadow-dom/Element-interface-shadowRoot-attribute.html",
+        "url": "/shadow-dom/Element-interface-shadowRoot-attribute.html"
+      },
+      {
+        "path": "shadow-dom/ShadowRoot-interface.html",
+        "url": "/shadow-dom/ShadowRoot-interface.html"
+      },
       {
         "path": "shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-001.html",
         "url": "/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-001.html"
@@ -28949,6 +29369,11 @@
         "timeout": "long",
         "url": "/html/syntax/parsing/html5lib_webkit02.html?run_type=write_single"
       },
+      {
+        "path": "media-source/SourceBuffer-abort-readyState.html",
+        "timeout": "long",
+        "url": "/media-source/SourceBuffer-abort-readyState.html"
+      },
       {
         "path": "media-source/mediasource-redundant-seek.html",
         "timeout": "long",
@@ -34629,7 +35054,7 @@
       }
     ]
   },
-  "rev": "0159b3ec9ba5355a3340621226e02ae026effd7f",
+  "rev": "7da6acfd668e66adae5ab4e2d389810d3b1460be",
   "url_base": "/",
   "version": 2
 }

tests/wpt/metadata/XMLHttpRequest/send-redirect-to-cors.htm.ini

@@ -1,14 +0,0 @@
-[send-redirect-to-cors.htm]
-  type: testharness
-  [XMLHttpRequest: send() - Redirect to CORS-enabled resource (301)]
-    expected: FAIL
-
-  [XMLHttpRequest: send() - Redirect to CORS-enabled resource (302)]
-    expected: FAIL
-
-  [XMLHttpRequest: send() - Redirect to CORS-enabled resource (303)]
-    expected: FAIL
-
-  [XMLHttpRequest: send() - Redirect to CORS-enabled resource (307)]
-    expected: FAIL
-

tests/wpt/metadata/XMLHttpRequest/send-redirect-to-non-cors.htm.ini

@@ -0,0 +1,14 @@
+[send-redirect-to-non-cors.htm]
+  type: testharness
+  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (301)]
+    expected: FAIL
+
+  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (302)]
+    expected: FAIL
+
+  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (303)]
+    expected: FAIL
+
+  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (307)]
+    expected: FAIL
+

tests/wpt/metadata/XMLHttpRequest/timeout-cors-async.htm.ini

@@ -1,5 +0,0 @@
-[timeout-cors-async.htm]
-  type: testharness
-  [XMLHttpRequest: timeout event and cross-origin request]
-    expected: FAIL
-

tests/wpt/metadata/dom/nodes/Document-createAttribute.html.ini

@@ -0,0 +1,5 @@
+[Document-createAttribute.html]
+  type: testharness
+  [HTML document.createAttribute("TITLE")]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/001.html.ini

@@ -0,0 +1,6 @@
+[001.html]
+  type: testharness
+  expected: TIMEOUT
+  [pageshow event from traversal]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html.ini

@@ -0,0 +1,5 @@
+[browsing_context_name.html]
+  type: testharness
+  [Retaining window.name on history traversal]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html.ini

@@ -0,0 +1,5 @@
+[browsing_context_name_cross_origin.html]
+  type: testharness
+  [Restoring window.name on cross-origin history traversal]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html.ini

@@ -0,0 +1,5 @@
+[browsing_context_name_cross_origin_2.html]
+  type: testharness
+  [Restoring window.name on cross-origin history traversal]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html.ini

@@ -0,0 +1,5 @@
+[browsing_context_name_cross_origin_3.html]
+  type: testharness
+  [Restoring window.name on cross-origin history traversal]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/events.html.ini

@@ -0,0 +1,50 @@
+[events.html]
+  type: testharness
+  [Constructing pageshow event]
+    expected: FAIL
+
+  [Constructing pagehide event]
+    expected: FAIL
+
+  [Constructing pageshow event, persisted true]
+    expected: FAIL
+
+  [Constructing pagehide event, persisted true]
+    expected: FAIL
+
+  [Constructing pageshow event, empty options]
+    expected: FAIL
+
+  [Constructing pagehide event, empty options]
+    expected: FAIL
+
+  [Constructing pageshow event, missing options]
+    expected: FAIL
+
+  [Constructing pagehide event, missing options]
+    expected: FAIL
+
+  [Constructing pageshow event, persisted:null]
+    expected: FAIL
+
+  [Constructing pagehide event, persisted:null]
+    expected: FAIL
+
+  [Constructing pageshow event, persisted:undefined]
+    expected: FAIL
+
+  [Constructing pagehide event, persisted:undefined]
+    expected: FAIL
+
+  [Constructing pageshow event, bubbles:true]
+    expected: FAIL
+
+  [Constructing pagehide event, bubbles:true]
+    expected: FAIL
+
+  [Constructing pageshow event, cancelable:true]
+    expected: FAIL
+
+  [Constructing pagehide event, cancelable:true]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/hashchange_event.html.ini

@@ -0,0 +1,6 @@
+[hashchange_event.html]
+  type: testharness
+  expected: TIMEOUT
+  [Queue a task to fire hashchange event]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini

@@ -0,0 +1,5 @@
+[popstate_event.html]
+  type: testharness
+  [Queue a task to fire popstate event]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/unset_context_name-1.html.ini

@@ -0,0 +1,5 @@
+[unset_context_name-1.html]
+  type: testharness
+  [window.name after navigating to a different origin]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/001.html.ini

@@ -0,0 +1,6 @@
+[001.html]
+  type: testharness
+  expected: TIMEOUT
+  [Cross-origin navigation started from unload handler]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/002.html.ini

@@ -0,0 +1,6 @@
+[002.html]
+  type: testharness
+  expected: TIMEOUT
+  [Multiple simultaneous navigations]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/003.html.ini

@@ -0,0 +1,6 @@
+[003.html]
+  type: testharness
+  expected: TIMEOUT
+  [Navigation from unload whilst traversing history]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/004.html.ini

@@ -0,0 +1,6 @@
+[004.html]
+  type: testharness
+  expected: TIMEOUT
+  [Navigation from unload whilst traversing cross-origin history]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini

@@ -0,0 +1,3 @@
+[005.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini

@@ -0,0 +1,3 @@
+[006.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/007.html.ini

@@ -0,0 +1,3 @@
+[007.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/008.html.ini

@@ -0,0 +1,3 @@
+[008.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/009.html.ini

@@ -0,0 +1,3 @@
+[009.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/010.html.ini

@@ -0,0 +1,3 @@
+[010.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/011.html.ini

@@ -0,0 +1,3 @@
+[011.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/012.html.ini

@@ -0,0 +1,3 @@
+[012.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/013.html.ini

@@ -0,0 +1,5 @@
+[013.html]
+  type: testharness
+  [Link with onclick navigation to javascript url with delayed document.write and href navigation ]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/014.html.ini

@@ -0,0 +1,5 @@
+[014.html]
+  type: testharness
+  [ Link with javascript onclick form submission script order ]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/015.html.ini

@@ -0,0 +1,5 @@
+[015.html]
+  type: testharness
+  [ Link with javascript onclick and href script order ]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location.html.ini

@@ -0,0 +1,6 @@
+[child_navigates_parent_location.html]
+  type: testharness
+  expected: TIMEOUT
+  [Child document navigating parent via location ]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit.html.ini

@@ -0,0 +1,6 @@
+[child_navigates_parent_submit.html]
+  type: testharness
+  expected: TIMEOUT
+  [Child document navigating parent via submit ]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url.html.ini

@@ -0,0 +1,6 @@
+[navigation_unload_data_url.html]
+  type: testharness
+  expected: TIMEOUT
+  [Same-origin navigation started from unload handler]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin.html.ini

@@ -0,0 +1,6 @@
+[navigation_unload_same_origin.html]
+  type: testharness
+  expected: TIMEOUT
+  [Same-origin navigation started from unload handler]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/001.html.ini

@@ -0,0 +1,5 @@
+[001.html]
+  type: testharness
+  [Fragment Navigation: Updating document address]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/002.html.ini

@@ -0,0 +1,5 @@
+[002.html]
+  type: testharness
+  [Fragment Navigation: Updating document address twice]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/003.html.ini

@@ -0,0 +1,5 @@
+[003.html]
+  type: testharness
+  [Fragment Navigation: Updating scroll position]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/004.html.ini

@@ -0,0 +1,6 @@
+[004.html]
+  type: testharness
+  expected: TIMEOUT
+  [Fragment Navigation: hashchange event]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/005.html.ini

@@ -0,0 +1,6 @@
+[005.html]
+  type: testharness
+  expected: TIMEOUT
+  [Fragment Navigation: hashchange event]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/006.html.ini

@@ -0,0 +1,6 @@
+[006.html]
+  type: testharness
+  expected: TIMEOUT
+  [Fragment Navigation: hashchange event multiple changes old/newURL]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/007.html.ini

@@ -0,0 +1,6 @@
+[007.html]
+  type: testharness
+  expected: TIMEOUT
+  [Fragment Navigation: hashchange event multiple changes old/newURL]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/history/the-location-interface/assign_after_load.html.ini

@@ -0,0 +1,6 @@
+[assign_after_load.html]
+  type: testharness
+  expected: TIMEOUT
+  [Assignment to location after document is completely loaded]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/history/the-location-interface/assign_before_load.html.ini

@@ -0,0 +1,6 @@
+[assign_before_load.html]
+  type: testharness
+  expected: TIMEOUT
+  [Assignment to location before document is completely loaded]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/browsers/history/the-location-interface/document_location.html.ini

@@ -0,0 +1,5 @@
+[document_location.html]
+  type: testharness
+  [document not in a browsing context]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/history/the-location-interface/location_assign_about_blank.html.ini

@@ -0,0 +1,5 @@
+[location_assign_about_blank.html]
+  type: testharness
+  [location.assign with initial about:blank browsing context]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load.html.ini

@@ -0,0 +1,6 @@
+[manual_click_replace_during_load.html]
+  type: testharness
+  expected: TIMEOUT
+  [Assignment to location with click during load]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_open_write.html.ini

@@ -0,0 +1,3 @@
+[reload_document_open_write.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write.html.ini

@@ -0,0 +1,3 @@
+[reload_document_write.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write_onload.html.ini

@@ -0,0 +1,3 @@
+[reload_document_write_onload.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/history/the-location-interface/reload_post_1.html.ini

@@ -0,0 +1,3 @@
+[reload_post_1.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html.ini

@@ -0,0 +1,6 @@
+[scripted_click_assign_during_load.html]
+  type: testharness
+  expected: TIMEOUT
+  [Assignment to location with click during load]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html.ini

@@ -0,0 +1,6 @@
+[scripted_click_location_assign_during_load.html]
+  type: testharness
+  expected: TIMEOUT
+  [location.assign with click during load]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html.ini

@@ -0,0 +1,6 @@
+[scripted_form_submit_assign_during_load.html]
+  type: testharness
+  expected: TIMEOUT
+  [Assignment to location with form submit during load]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html.ini

@@ -0,0 +1,23 @@
+[window_length.html]
+  type: testharness
+  [No child browsing contexts]
+    expected: FAIL
+
+  [iframe not inserted into the document]
+    expected: FAIL
+
+  [One iframe inserted into the document]
+    expected: FAIL
+
+  [Child browsing context has a child browsing context]
+    expected: FAIL
+
+  [window.length in child frame]
+    expected: FAIL
+
+  [Opened window]
+    expected: FAIL
+
+  [Iframe in opened window]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini

@@ -0,0 +1,6 @@
+[close_beforeunload.html]
+  type: testharness
+  expected: TIMEOUT
+  [Running beforeunload handler in window.close()]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html.ini

@@ -0,0 +1,5 @@
+[close_script_defer.html]
+  type: testharness
+  [Running defer script in window.close()]
+    expected: FAIL
+

tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini

@@ -0,0 +1,6 @@
+[close_unload.html]
+  type: testharness
+  expected: TIMEOUT
+  [Running unload handler in window.close()]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html.ini

@@ -0,0 +1,6 @@
+[discard_iframe_history_1.html]
+  type: testharness
+  expected: TIMEOUT
+  [Removing iframe from document removes it from history]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html.ini

@@ -0,0 +1,6 @@
+[discard_iframe_history_2.html]
+  type: testharness
+  expected: TIMEOUT
+  [Removing iframe from document via innerHTML removes it from history]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html.ini

@@ -0,0 +1,6 @@
+[discard_iframe_history_3.html]
+  type: testharness
+  expected: TIMEOUT
+  [Removing iframe from document removes it from history]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html.ini

@@ -0,0 +1,6 @@
+[discard_iframe_history_4.html]
+  type: testharness
+  expected: TIMEOUT
+  [Removing iframe from document removes it from history]
+    expected: NOTRUN
+

tests/wpt/metadata/html/browsers/windows/browsing-context-names/001.html.ini

@@ -0,0 +1,3 @@
+[001.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/windows/browsing-context-names/002.html.ini

@@ -0,0 +1,3 @@
+[002.html]
+  type: testharness
+  expected: TIMEOUT

tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/window-top-001.html.ini

@@ -0,0 +1,9 @@
+[window-top-001.html]
+  type: testharness
+  expected: TIMEOUT
+  [One nested iframe]
+    expected: TIMEOUT
+
+  [Two nested iframes]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini

@@ -10,9 +10,6 @@
   [Script iframe-src]
     expected: NOTRUN
 
-  [Script cross-origin]
-    expected: NOTRUN
-
   [Script document-write]
     expected: NOTRUN
 

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html.ini

@@ -1,9 +1,8 @@
 [compile-error-cross-origin-setInterval.html]
   type: testharness
-  expected: TIMEOUT
   [window.onerror - compile error in cross-origin setInterval]
-    expected: NOTRUN
+    expected: FAIL
 
   [window.onerror - compile error in cross-origin setInterval (column)]
-    expected: NOTRUN
+    expected: FAIL
 

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html.ini

@@ -1,9 +1,8 @@
 [compile-error-cross-origin-setTimeout.html]
   type: testharness
-  expected: TIMEOUT
   [window.onerror - compile error in cross-origin setTimeout]
-    expected: NOTRUN
+    expected: FAIL
 
   [window.onerror - compile error in cross-origin setTimeout (column)]
-    expected: NOTRUN
+    expected: FAIL
 

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html.ini

@@ -1,9 +1,8 @@
 [runtime-error-cross-origin-setInterval.html]
   type: testharness
-  expected: TIMEOUT
   [window.onerror - runtime error in cross-origin setInterval]
-    expected: NOTRUN
+    expected: FAIL
 
   [window.onerror - runtime error in cross-origin setInterval (column)]
-    expected: NOTRUN
+    expected: FAIL
 

tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html.ini

@@ -1,9 +1,8 @@
 [runtime-error-cross-origin-setTimeout.html]
   type: testharness
-  expected: TIMEOUT
   [window.onerror - runtime error in cross-origin setTimeout]
-    expected: NOTRUN
+    expected: FAIL
 
   [window.onerror - runtime error in cross-origin setTimeout (column)]
-    expected: NOTRUN
+    expected: FAIL
 

tests/wpt/metadata/mozilla-sync

@@ -1 +1 @@
-d588ce8d8503bf0b340abfb13e2bd6a228cab900
+a350b215cc3e943985a66f1485c7eac7f4b9832e

tests/wpt/mozilla/meta/mozilla/navigator.html.ini

@@ -1,12 +1,10 @@
 [navigator.html]
   type: testharness
-
   [navigator.platform linux]
     expected:
       if os != "linux": FAIL
-      PASS
 
   [navigator.platform mac]
     expected:
       if os != "mac": FAIL
-      PASS
+

tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor2.htm

@@ -20,7 +20,7 @@
 
         e.target.transaction.abort();
 
-        assert_throws("InvalidStateError", function(){
+        assert_throws("TransactionInactiveError", function(){
             index.openCursor();
         });
         t.done();

tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor3.htm

@@ -20,7 +20,7 @@
 
         e.target.transaction.abort();
 
-        assert_throws("InvalidStateError", function(){
+        assert_throws("TransactionInactiveError", function(){
             index.openKeyCursor();
         });
         t.done();

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <title>script-src disallowed wildcard use</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+    <!-- enforcing policy:
+script-src 'nonce-nonce' *; connect-src 'self';
+-->
+    <script nonce="nonce">
+        var t1 = async_test('data: URIs should not match *');
+        t1.step(function() {
+            var script = document.createElement("script");
+            script.src = 'data:application/javascript,';
+            script.addEventListener('load', t1.step_func(function() {
+                assert_unreached('Should not successfully load data URI.');
+            }));
+            script.addEventListener('error', t1.step_func(function() {
+                t1.done();
+            }));
+            document.head.appendChild(script);
+        });
+
+        var t2 = async_test('blob: URIs should not match *');
+        t2.step(function() {
+            var b = new Blob([''], { type: 'application/javascript' });
+            var script = document.createElement('script');
+            script.addEventListener('load', t2.step_func(function() {
+                assert_unreached('Should not successfully load blob URI.');
+            }));
+            script.addEventListener('error', t2.step_func(function() {
+                t2.done();
+            }));
+
+            script.src = URL.createObjectURL(b);
+            document.head.appendChild(script);
+        });
+
+        var t3 = async_test('filesystem URIs should not match *');
+        if (window.webkitRequestFileSystem) {
+            window.webkitRequestFileSystem(TEMPORARY, 1024*1024 /*1MB*/, function(fs) {
+                fs.root.getFile('fail.js', {create: true}, function(fileEntry) {
+                    fileEntry.createWriter(function(fileWriter) {
+                        var script = document.createElement('script');
+
+                        script.addEventListener('load', t3.step_func(function() {
+                            assert_unreached('Should not successfully load filesystem URI.');
+                        }));
+                        script.addEventListener('error', t3.step_func(function() {
+                            t3.done();
+                        }));
+
+                        script.src = fileEntry.toURL('application/javascript');
+                        document.body.appendChild(script);
+                    });
+                });
+            });
+        } else {
+          t3.done();
+        }
+    </script>
+    </body>
+</html>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/script-src-wildcards-disallowed.html.sub.headers

@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: script-src-wildcards-disallowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
+Content-Security-Policy: script-src 'nonce-nonce' *; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <title>script-hash allowed from default-src</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    
+    <script>done();</script>
+    </head>
+
+    <body>
+    <div id="log"></div>
+    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    </body>
+</html>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-default-src.sub.html.sub.headers

@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: scripthash-default-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
+Content-Security-Policy: default-src 'self' 'sha256-sc3CeiHrlck5tH2tTC4MnBYFnI9D5zp8f9odqnmGQjE='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <title>stylehash allowed from default-src</title>
+    <script src="../../../resources/testharness.js"></script>
+    <script src="../../../resources/testharnessreport.js"></script>
+    </head>
+
+    <body>
+    <p id="p">Test</p>
+    <style>p#p { color: green; }</style>
+    <script>
+    var color = window.getComputedStyle(document.querySelector('#p')).color;
+    assert_equals(color, "rgb(0, 128, 0)");
+    done();
+    </script>
+
+    <div id="log"></div>
+    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    </body>
+</html>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/stylehash-default-src.sub.html.sub.headers

@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: stylehash-default-src={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
+Content-Security-Policy: default-src 'self' 'sha256-SXMrww9+PS7ymkxYbv91id+HfXeO7p1uCY0xhNb4MIw='; script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}

tests/wpt/web-platform-tests/dom/historical.html

@@ -47,7 +47,6 @@ var documentNuked = [
   "domConfig",
   "normalizeDocument",
   "renameNode",
-  "charset",
   "defaultCharset",
   "height",
   "width"

tests/wpt/web-platform-tests/dom/nodes/Document-createAttribute.html

@@ -7,20 +7,37 @@
 <script src=productions.js></script>
 <div id=log>
 <script>
+var xml_document;
+setup(function() {
+  xml_document = document.implementation.createDocument(null, null, null);
+});
+
 invalid_names.forEach(function(name) {
   test(function() {
     assert_throws("INVALID_CHARACTER_ERR", function() {
       document.createAttribute(name, "test");
     });
-  }, "createAttribute(" + format_value(name) + ")");
+  }, "HTML document.createAttribute(" + format_value(name) + ")");
+
+  test(function() {
+    assert_throws("INVALID_CHARACTER_ERR", function() {
+      xml_document.createAttribute(name, "test");
+    });
+  }, "XML document.createAttribute(" + format_value(name) + ")");
 });
 
 var tests = ["title", "TITLE", null, undefined];
 tests.forEach(function(name) {
   test(function() {
     var attribute = document.createAttribute(name);
+    attr_is(attribute, "", String(name).toLowerCase(), null, null, String(name).toLowerCase());
+    assert_equals(attribute.ownerElement, null);
+  }, "HTML document.createAttribute(" + format_value(name) + ")");
+
+  test(function() {
+    var attribute = xml_document.createAttribute(name);
     attr_is(attribute, "", String(name), null, null, String(name));
     assert_equals(attribute.ownerElement, null);
-  }, "createAttribute(" + format_value(name) + ")");
+  }, "XML document.createAttribute(" + format_value(name) + ")");
 });
 </script>

tests/wpt/web-platform-tests/domxpath/xml_xpath_runner.html

@@ -0,0 +1,51 @@
+<!doctype html>
+<title>XPath tests</title>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script>
+setup({ explicit_done: true });
+
+function find_child_element(context, element) {
+  for (var i = 0; i < context.childNodes.length; i++) {
+    var child = context.childNodes[i];
+    if (child.nodeType === Node.ELEMENT_NODE && child.tagName === element)
+      return child;
+  }
+}
+
+function xpath_test(test_el) {
+  /* note this func adopts the tree! */
+  var new_doc = document.implementation.createDocument("", "");
+  var xpath = find_child_element(test_el, "xpath");
+  var tree = find_child_element(test_el, "tree");
+  var actual_tree = new_doc.adoptNode(tree.firstElementChild);
+  new_doc.appendChild(actual_tree);
+  test(function() {
+    var result = new_doc.evaluate(xpath.textContent, // expression
+                                  actual_tree, // context node
+                                  new_doc.createNSResolver(actual_tree), // resolver
+                                  XPathResult.ANY_TYPE, // type
+                                  null); // result
+    var matched = [];
+    var cur;
+    while ((cur = result.iterateNext()) !== null) {
+      matched.push(cur);
+    }
+    assert_equals(matched.length, 1, "Should match one node");
+  });
+}
+
+var xhr = new XMLHttpRequest();
+xhr.open("GET", "xml_xpath_tests.xml");
+xhr.onload = function(e) {
+  var tests = xhr.responseXML.documentElement;
+  for (var i = 0; i < tests.childNodes.length; i++) {
+    var child = tests.childNodes[i];
+    if (child.nodeType === Node.ELEMENT_NODE) {
+      xpath_test(child);
+    }
+  }
+  done();
+};
+xhr.send();
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-1.html

@@ -0,0 +1,11 @@
+<!doctype html>
+001-1
+<script>
+addEventListener("pageshow",
+  function(e) {
+    parent.events.push(e);
+    if (parent.events.length == 2) {
+      parent.do_test();
+    }
+  }, false);
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-2.html

@@ -0,0 +1,5 @@
+<!doctype html>
+001-2
+<script>
+onload = function() {setTimeout(function() {history.go(-1)}, 500)}
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001.html

@@ -0,0 +1,30 @@
+<!doctype html>
+<title>pageshow event from traversal</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<iframe src="001-1.html"></iframe>
+<script>
+var t = async_test();
+var events = [];
+var iframe = document.getElementsByTagName("iframe")[0];
+
+onload = t.step_func(function() {
+  setTimeout(t.step_func(
+    function() {
+      assert_equals(iframe.contentDocument.readyState, "complete")
+      iframe.src = "001-2.html";
+    }), 500);
+  onload = null;
+})
+
+do_test = t.step_func(function() {
+  assert_equals(events.length, 2);
+  events.forEach(function(e, i) {
+    phase = i ? "after" : "before";
+    assert_equals(e.type, "pageshow", "type " + phase + " navigation");
+    assert_equals(e.persisted, i == 0 ? false : true, "persisted " + phase + " navigation");
+    t.done();
+  });
+});
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/MANIFEST

@@ -0,0 +1,16 @@
+support 001-1.html
+support 001-2.html
+001.html
+support browsing_context_name-1.html
+support browsing_context_name-2.html
+support browsing_context_name-3.html
+support browsing_context_name-4.html
+browsing_context_name_cross_origin_2.html
+browsing_context_name_cross_origin_3.html
+browsing_context_name_cross_origin.html
+browsing_context_name.html
+events.html
+hashchange_event.html
+popstate_event.html
+support unset_context_name-1.html
+unset_context_name.html

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html

@@ -0,0 +1,6 @@
+document 1
+<script>
+if (!parent.navigated) {
+    window.name = "test";
+}
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html

@@ -0,0 +1,4 @@
+document 2
+<script>
+window.name = "test1";
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html

@@ -0,0 +1,6 @@
+document 3
+<script>
+if (!parent.navigated) {
+    window.name = "test3";
+}
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html

@@ -0,0 +1,6 @@
+document 4
+<script>
+if (!parent.navigated) {
+    window.name = "test4";
+}
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html

@@ -0,0 +1,42 @@
+<!doctype html>
+<title>Retaining window.name on history traversal</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<pre id="step_log"></pre>
+<iframe id="test"></iframe>
+<script>
+
+var t = async_test(undefined, {timeout:10000});
+var f = document.getElementById("test");
+var l = document.getElementById("step_log");
+var navigated = false;
+
+log = function(t) {l.textContent += ("\n" + t)}
+
+var steps = [
+  function() {f.src = "browsing_context_name-1.html"},
+  function() {
+                var navigated = true;
+                assert_equals(f.contentWindow.name, "test", "Initial load");
+                setTimeout(next, 0);
+              },
+  function() {f.src = "browsing_context_name-2.html"; setTimeout(next, 500)},
+  function() {
+               assert_equals(f.contentWindow.name, "test1");
+               setTimeout(next, 0);
+             },
+  function() {history.back(); setTimeout(next, 500)},
+  function() {
+               assert_equals(f.contentWindow.name, "test1", "After navigation");
+               t.done();
+             }
+].map(function(x) {return t.step_func(function() {log("Step " + step); x()})});
+
+var step = 0;
+next = t.step_func(function() {steps[step++]()});
+
+f.onload=next;
+
+onload = setTimeout(next, 0);
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html

@@ -0,0 +1,41 @@
+<!doctype html>
+<title>Restoring window.name on cross-origin history traversal</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<pre id="step_log"></pre>
+<iframe id="test"></iframe>
+<script>
+
+var t = async_test(undefined, {timeout:10000});
+var f = document.getElementById("test");
+var l = document.getElementById("step_log");
+var navigated = false;
+
+log = function(t) {l.textContent += ("\n" + t)}
+
+var steps = [
+  function() {f.src = "browsing_context_name-1.html"},
+  function() {
+                var navigated = true;
+                assert_equals(f.contentWindow.name, "test", "Initial load");
+                setTimeout(next, 0);
+              },
+  function() {f.src = f.src.replace("http://", "http://www.").replace("browsing_context_name-1", "browsing_context_name-2");},
+  function() {
+               setTimeout(next, 0);
+             },
+  function() {history.back(); setTimeout(next, 500)},
+  function() {
+               assert_equals(f.contentWindow.name, "test", "After navigation");
+               t.done();
+             }
+].map(function(x) {return t.step_func(function() {log("Step " + step); x()})});
+
+var step = 0;
+next = t.step_func(function() {steps[step++]()});
+
+f.onload=next;
+
+onload = setTimeout(next, 0);
+</script>

tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html

@@ -0,0 +1,47 @@
+<!doctype html>
+<title>Restoring window.name on cross-origin history traversal</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<pre id="step_log"></pre>
+<iframe id="test"></iframe>
+<script>
+
+var t = async_test(undefined, {timeout:10000});
+var f = document.getElementById("test");
+var l = document.getElementById("step_log");
+var navigated = false;
+
+log = function(t) {l.textContent += ("\n" + t)}
+
+var steps = [
+  function() {f.src = "browsing_context_name-1.html"},
+  function() {
+                var navigated = true;
+                assert_equals(f.contentWindow.name, "test", "Initial load");
+                setTimeout(next, 0);
+              },
+  function() {f.src = "browsing_context_name-3.html"},
+  function() {
+                var navigated = true;
+                assert_equals(f.contentWindow.name, "test3", "Initial load");
+                setTimeout(next, 0);
+              },
+  function() {f.src = f.src.replace("http://", "http://www.").replace("browsing_context_name-3", "browsing_context_name-2");},
+  function() {
+               setTimeout(next, 0);
+             },
+  function() {history.go(-2); setTimeout(next, 500)},
+  function() {
+               assert_equals(f.contentWindow.name, "test3", "After navigation");
+               t.done();
+             }
+].map(function(x) {return t.step_func(function() {log("Step " + step); x()})});
+
+var step = 0;
+next = t.step_func(function() {steps[step++]()});
+
+f.onload=next;
+
+onload = setTimeout(next, 0);
+</script>