URI to URL #11450

servo · Coder206 · Jun 18, 2016 · Jun 18, 2016 · Jun 18, 2016 · 7fd08aebc39dd86bc2ae89fdb20a8e9503f996f2
commit 7fd08aebc39dd86bc2ae89fdb20a8e9503f996f2
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
@@ -379,9 +379,9 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement {
             MozBrowserEvent::TitleChange(ref string) => {
                 string.to_jsval(cx, rval);
             }
-            MozBrowserEvent::LocationChange(uri, can_go_back, can_go_forward) => {
+            MozBrowserEvent::LocationChange(url, can_go_back, can_go_forward) => {
                 BrowserElementLocationChangeEventDetail {
-                    uri: Some(DOMString::from(uri)),
+                    url: Some(DOMString::from(url)),
                     canGoBack: Some(can_go_back),
                     canGoForward: Some(can_go_forward),
                 }.to_jsval(cx, rval);

diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl
@@ -64,7 +64,7 @@ dictionary BrowserElementErrorEventDetail {
 };
 
 dictionary BrowserElementLocationChangeEventDetail {
-  DOMString uri;
+  DOMString url;
   boolean canGoBack;
   boolean canGoForward;
 };

diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html
@@ -39,7 +39,7 @@
   var action_idx = 0;
 
   iframe.addEventListener("mozbrowserlocationchange", e => {
-    received_events.push(e.detail.uri);
+    received_events.push(e.detail.url);
     received_events.push(e.detail.canGoBack);
     received_events.push(e.detail.canGoForward);