From ecb65474a79684a0f84694336297d24e746dfc3e Mon Sep 17 00:00:00 2001
From: tigercosmos <phy.tiger@gmail.com>
Date: Sun, 17 Jun 2018 11:13:36 -0700
Subject: [PATCH] Let the popstate and hashchange events not bubble

---
 components/script/dom/history.rs                              | 2 +-
 components/script/dom/popstateevent.rs                        | 2 +-
 .../history-traversal/popstate_event.html.ini                 | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini

diff --git a/components/script/dom/history.rs b/components/script/dom/history.rs
index 1f3b652b0e99..369c59b524c5 100644
--- a/components/script/dom/history.rs
+++ b/components/script/dom/history.rs
@@ -129,7 +129,7 @@ impl History {
             let event = HashChangeEvent::new(
                 &self.window,
                 atom!("hashchange"),
-                true,
+                false,
                 false,
                 old_url.into_string(),
                 url.into_string());
diff --git a/components/script/dom/popstateevent.rs b/components/script/dom/popstateevent.rs
index a10d19e30021..f4341777dc6f 100644
--- a/components/script/dom/popstateevent.rs
+++ b/components/script/dom/popstateevent.rs
@@ -71,7 +71,7 @@ impl PopStateEvent {
     pub fn dispatch_jsval(target: &EventTarget,
                           window: &Window,
                           state: HandleValue) {
-        let event = PopStateEvent::new(window, atom!("popstate"), true, false, state);
+        let event = PopStateEvent::new(window, atom!("popstate"), false, false, state);
         event.upcast::<Event>().fire(target);
     }
 }
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini
deleted file mode 100644
index 7124dbe254fe..000000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[popstate_event.html]
-  [Queue a task to fire popstate event]
-    expected: FAIL
-