Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

update pipeline url after redirections

Browse source
This commit is contained in:
Paul Rouget 2016-01-06 06:19:47 +01:00
parent ea4206e362
commit 268e285439
7 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/compositing/constellation.rs
View file

@ -622,6 +622,11 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
debug!("constellation got activate document message"); debug!("constellation got activate document message");
self.handle_activate_document_msg(pipeline_id); self.handle_activate_document_msg(pipeline_id);
} }
// Update pipeline url after redirections
Request::Script(FromScriptMsg::SetFinalUrl(pipeline_id, final_url)) => {
debug!("constellation got set final url message");
self.mut_pipeline(pipeline_id).url = final_url;
}
Request::Script(FromScriptMsg::MozBrowserEvent(pipeline_id, Request::Script(FromScriptMsg::MozBrowserEvent(pipeline_id,
subpage_id, subpage_id,
event)) => { event)) => {

4
components/script/script_task.rs
View file

@ -1648,6 +1648,10 @@ impl ScriptTask {
// send the final url to the layout task. // send the final url to the layout task.
let LayoutChan(ref chan) = incomplete.layout_chan; let LayoutChan(ref chan) = incomplete.layout_chan;
chan.send(layout_interface::Msg::SetFinalUrl(final_url.clone())).unwrap(); chan.send(layout_interface::Msg::SetFinalUrl(final_url.clone())).unwrap();
// update the pipeline url
let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(ConstellationMsg::SetFinalUrl(incomplete.pipeline_id, final_url.clone())).unwrap();
} }
debug!("ScriptTask: loading {} on page {:?}", incomplete.url.serialize(), incomplete.pipeline_id); debug!("ScriptTask: loading {} on page {:?}", incomplete.url.serialize(), incomplete.pipeline_id);

2
components/script_traits/script_msg.rs
View file

@ -79,4 +79,6 @@ pub enum ScriptMsg {
ActivateDocument(PipelineId), ActivateDocument(PipelineId),
/// Set the document state for a pipeline (used by screenshot / reftests) /// Set the document state for a pipeline (used by screenshot / reftests)
SetDocumentState(PipelineId, DocumentState), SetDocumentState(PipelineId, DocumentState),
/// Update the pipeline Url, which can change after redirections.
SetFinalUrl(PipelineId, Url),
} }

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -5785,6 +5785,12 @@
"url": "/_mozilla/mozilla/mozbrowser/mozbrowsershowmodalprompt_event.html" "url": "/_mozilla/mozilla/mozbrowser/mozbrowsershowmodalprompt_event.html"
} }
], ],
"mozilla/mozbrowser/redirect.html": [
{
"path": "mozilla/mozbrowser/redirect.html",
"url": "/_mozilla/mozilla/mozbrowser/redirect.html"
}
],
"mozilla/mozbrowser/reload.html": [ "mozilla/mozbrowser/reload.html": [
{ {
"path": "mozilla/mozbrowser/reload.html", "path": "mozilla/mozbrowser/reload.html",

18
tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect.html Normal file
View file

@ -0,0 +1,18 @@
<!doctype html>
<meta charset="utf-8">
<title>mozbrowserlocationchange with final url after redirect</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<body></body>
<script>
async_test(function(t) {
var iframe = document.createElement("iframe");
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);
t.done();
}));
document.body.appendChild(iframe);
});
</script>

1
tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect_final.html Normal file
View file

@ -0,0 +1 @@
<h1>redirect_final</h1>

1
tests/wpt/mozilla/tests/mozilla/mozbrowser/redirect_init.html Normal file
View file

@ -0,0 +1 @@
<h1>redirect_init</h1>