From 6577409b95bc782c0493cc5186fa4ed0d31d680d Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Mon, 21 Mar 2016 19:19:48 +0800
Subject: [PATCH] Add history information to mozbrowserlocationchange event

---
 components/compositing/constellation.rs       |  7 ++-
 components/script/dom/htmliframeelement.rs    | 10 +++-
 .../script/dom/webidls/BrowserElement.webidl  |  6 ++
 components/script_traits/lib.rs               |  4 +-
 tests/wpt/mozilla/meta/MANIFEST.json          |  6 ++
 .../mozilla/mozbrowser/iframe_goback.html     |  4 +-
 .../mozbrowserlocationchange_event.html       | 59 +++++++++++++++++++
 .../tests/mozilla/mozbrowser/redirect.html    |  2 +-
 8 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html

diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs
index 86f9e9620a0..a8d7952efaf 100644
--- a/components/compositing/constellation.rs
+++ b/components/compositing/constellation.rs
@@ -1655,8 +1655,11 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
             // If this is an iframe, then send the event with new url
             if let Some((containing_pipeline_id, subpage_id, url)) = event_info {
                 let parent_pipeline = self.pipeline(containing_pipeline_id);
-                parent_pipeline.trigger_mozbrowser_event(subpage_id,
-                                                         MozBrowserEvent::LocationChange(url));
+                let frame_id = *self.pipeline_to_frame_map.get(&pipeline_id).unwrap();
+                let can_go_backward = !self.frame(frame_id).prev.is_empty();
+                let can_go_forward = !self.frame(frame_id).next.is_empty();
+                let event = MozBrowserEvent::LocationChange(url, can_go_backward, can_go_forward);
+                parent_pipeline.trigger_mozbrowser_event(subpage_id, event);
             }
         }
     }
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 4cf2c3f467e..a4ccafd2d4c 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -6,6 +6,7 @@ use document_loader::{LoadType, LoadBlocker};
 use dom::attr::{Attr, AttrValue};
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementIconChangeEventDetail;
+use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementLocationChangeEventDetail;
 use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementSecurityChangeDetail;
 use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserShowModalPromptEventDetail;
 use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
@@ -323,9 +324,16 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement {
                     mixedState: None,
                 }.to_jsval(cx, rval);
             }
-            MozBrowserEvent::LocationChange(ref string) | MozBrowserEvent::TitleChange(ref string) => {
+            MozBrowserEvent::TitleChange(ref string) => {
                 string.to_jsval(cx, rval);
             }
+            MozBrowserEvent::LocationChange(uri, can_go_back, can_go_forward) => {
+                BrowserElementLocationChangeEventDetail {
+                    uri: Some(DOMString::from(uri)),
+                    canGoBack: Some(can_go_back),
+                    canGoForward: Some(can_go_forward),
+                }.to_jsval(cx, rval);
+            }
             MozBrowserEvent::IconChange(rel, href, sizes) => {
                 BrowserElementIconChangeEventDetail {
                     rel: Some(DOMString::from(rel)),
diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl
index 33f1fa6fd5e..6e658a1b5b7 100644
--- a/components/script/dom/webidls/BrowserElement.webidl
+++ b/components/script/dom/webidls/BrowserElement.webidl
@@ -54,6 +54,12 @@ dictionary BrowserElementSecurityChangeDetail {
   boolean mixedContent;
 };
 
+dictionary BrowserElementLocationChangeEventDetail {
+  DOMString uri;
+  boolean canGoBack;
+  boolean canGoForward;
+};
+
 dictionary BrowserElementIconChangeEventDetail {
   DOMString rel;
   DOMString href;
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 9b69525d205..6aeca4068ec 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -424,7 +424,7 @@ pub enum MozBrowserEvent {
     /// Sent when the browser `<iframe>` starts to load a new page.
     LoadStart,
     /// Sent when a browser `<iframe>`'s location changes.
-    LocationChange(String),
+    LocationChange(String, bool, bool),
     /// Sent when window.open() is called within a browser `<iframe>`.
     OpenWindow,
     /// Sent when the SSL state changes within a browser `<iframe>`.
@@ -451,7 +451,7 @@ impl MozBrowserEvent {
             MozBrowserEvent::IconChange(_, _, _) => "mozbrowsericonchange",
             MozBrowserEvent::LoadEnd => "mozbrowserloadend",
             MozBrowserEvent::LoadStart => "mozbrowserloadstart",
-            MozBrowserEvent::LocationChange(_) => "mozbrowserlocationchange",
+            MozBrowserEvent::LocationChange(_, _, _) => "mozbrowserlocationchange",
             MozBrowserEvent::OpenWindow => "mozbrowseropenwindow",
             MozBrowserEvent::SecurityChange(_) => "mozbrowsersecuritychange",
             MozBrowserEvent::ShowModalPrompt(_, _, _, _) => "mozbrowsershowmodalprompt",
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 34f6556c9b8..cfa07170b27 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6024,6 +6024,12 @@
             "url": "/_mozilla/mozilla/mozbrowser/mozbrowsericonchange_event.html"
           }
         ],
+        "mozilla/mozbrowser/mozbrowserlocationchange_event.html": [
+          {
+            "path": "mozilla/mozbrowser/mozbrowserlocationchange_event.html",
+            "url": "/_mozilla/mozilla/mozbrowser/mozbrowserlocationchange_event.html"
+          }
+        ],
         "mozilla/mozbrowser/mozbrowsersecuritychange_event.html": [
           {
             "path": "mozilla/mozbrowser/mozbrowsersecuritychange_event.html",
diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/iframe_goback.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/iframe_goback.html
index 518bb3d5a47..e8c7299e55a 100644
--- a/tests/wpt/mozilla/tests/mozilla/mozbrowser/iframe_goback.html
+++ b/tests/wpt/mozilla/tests/mozilla/mozbrowser/iframe_goback.html
@@ -19,8 +19,8 @@ async_test(function(t) {
   iframe.src = url1;
 
   iframe.addEventListener("mozbrowserlocationchange", e => {
-    locations.push(e.detail);
-    if (e.detail == url2) {
+    locations.push(e.detail.uri);
+    if (e.detail.uri == url2) {
       iframe.goBack();
     }
     if (locations.length == expected_locations.length) {
diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html
new file mode 100644
index 00000000000..4198ed66397
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html
@@ -0,0 +1,59 @@
+<head>
+<title>Browser API; mozbrowserlocationchange event</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+async_test(function(t) {
+
+  var url1 = "data:,1";
+  var url2 = "data:,2";
+  var url3 = "data:,3";
+
+  var received_events = []
+  var expected_events = [
+    url1, false, false,
+    url2, true,  false,
+    url3, true,  false,
+    url2, true,  true,
+    url1, false, true,
+    url2, true,  true,
+    url3, true,  false,
+  ];
+
+  var iframe = document.createElement("iframe");
+  iframe.mozbrowser = "true";
+  iframe.src = url1;
+
+  var actions = [
+    function() {iframe.src = url2},
+    function() {iframe.src = url3},
+    function() {iframe.goBack()},
+    function() {iframe.goBack()},
+    function() {iframe.goForward()},
+    function() {iframe.goForward()},
+  ];
+
+  var action_idx = 0;
+
+  iframe.addEventListener("mozbrowserlocationchange", e => {
+    received_events.push(e.detail.uri);
+    received_events.push(e.detail.canGoBack);
+    received_events.push(e.detail.canGoForward);
+
+    if (action_idx < actions.length) {
+      actions[action_idx++]();
+    } else {
+       assert_array_equals(received_events, expected_events);
+       t.done();
+    }
+  });
+
+  document.body.appendChild(iframe);
+
+});
+
+</script>
+</body>
diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html
index 6d9c11fdbe2..b90871b8197 100644
--- a/tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html
+++ b/tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html
@@ -10,7 +10,7 @@
         iframe.mozbrowser = "true";
         iframe.src = "redirect_init.html?pipe=status(302)|header(Location,redirect_final.html)";
         iframe.addEventListener("mozbrowserlocationchange", t.step_func(e => {
-            assert_equals(e.detail, new URL("redirect_final.html", location).href);
+            assert_equals(e.detail.uri, new URL("redirect_final.html", location).href);
             t.done();
         }));
         document.body.appendChild(iframe);