diff options
5 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index d3359a40c89..3c5377b8c98 100644 --- 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 index f183b5cf813..6105811666b 100644 --- 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/iframe_goback.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/iframe_goback.html index e8c7299e55a..748f434d7c3 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.uri); - if (e.detail.uri == url2) { + locations.push(e.detail.url); + if (e.detail.url == 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 index dcf2f5dbc9f..c2ba1d3e4e8 100644 --- a/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html +++ b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html @@ -39,7 +39,7 @@ async_test(function(t) { 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); diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html index b90871b8197..b7587395f94 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.uri, new URL("redirect_final.html", location).href); + assert_equals(e.detail.url, new URL("redirect_final.html", location).href); t.done(); })); document.body.appendChild(iframe); |