Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-17 12:54:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

URI to URL

Browse source 
trying to pass test - uri
This commit is contained in:
Patrick Trottier 2016-06-18 18:09:30 -04:00 • committed by Coder206
parent 09a39af1c1
commit 97eb594cc2
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/htmliframeelement.rs
View file

@ -379,9 +379,9 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement {
MozBrowserEvent::TitleChange(ref string) => { MozBrowserEvent::TitleChange(ref string) => {
string.to_jsval(cx, rval); string.to_jsval(cx, rval);
} }
MozBrowserEvent::LocationChange(uri, can_go_back, can_go_forward) => { MozBrowserEvent::LocationChange(url, can_go_back, can_go_forward) => {
BrowserElementLocationChangeEventDetail { BrowserElementLocationChangeEventDetail {
uri: Some(DOMString::from(uri)), url: Some(DOMString::from(url)),
canGoBack: Some(can_go_back), canGoBack: Some(can_go_back),
canGoForward: Some(can_go_forward), canGoForward: Some(can_go_forward),
}.to_jsval(cx, rval); }.to_jsval(cx, rval);

2
components/script/dom/webidls/BrowserElement.webidl
View file

@ -64,7 +64,7 @@ dictionary BrowserElementErrorEventDetail {
}; };
dictionary BrowserElementLocationChangeEventDetail { dictionary BrowserElementLocationChangeEventDetail {
DOMString uri; DOMString url;
boolean canGoBack; boolean canGoBack;
boolean canGoForward; boolean canGoForward;
}; };

4
tests/wpt/mozilla/tests/mozilla/mozbrowser/iframe_goback.html
View file

@ -19,8 +19,8 @@ async_test(function(t) {
iframe.src = url1; iframe.src = url1;
iframe.addEventListener("mozbrowserlocationchange", e => { iframe.addEventListener("mozbrowserlocationchange", e => {
locations.push(e.detail.uri); locations.push(e.detail.url);
if (e.detail.uri == url2) { if (e.detail.url == url2) {
iframe.goBack(); iframe.goBack();
} }
if (locations.length == expected_locations.length) { if (locations.length == expected_locations.length) {

2
tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowserlocationchange_event.html
View file

@ -39,7 +39,7 @@ async_test(function(t) {
var action_idx = 0; var action_idx = 0;
iframe.addEventListener("mozbrowserlocationchange", e => { 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.canGoBack);
received_events.push(e.detail.canGoForward); received_events.push(e.detail.canGoForward);

2
tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html
View file

@ -10,7 +10,7 @@
iframe.mozbrowser = "true"; iframe.mozbrowser = "true";
iframe.src = "redirect_init.html?pipe=status(302)|header(Location,redirect_final.html)"; iframe.src = "redirect_init.html?pipe=status(302)|header(Location,redirect_final.html)";
iframe.addEventListener("mozbrowserlocationchange", t.step_func(e => { 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(); t.done();
})); }));
document.body.appendChild(iframe); document.body.appendChild(iframe);