diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-16 23:18:30 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-16 23:18:30 +0530 |
| commit | bc7158310ce8abf6605840f1c23013640703e285 (patch) | |
| tree | 788e1134def020d1406ef3f9f098edb4fd863f99 /components/script/script_task.rs | |
| parent | 39b205daccb96ebfcc5b396fc828381fa2a8c252 (diff) | |
| parent | 2ee446de5d987c911f91dafa499d8a9f7df61995 (diff) | |
| download | servo-bc7158310ce8abf6605840f1c23013640703e285.tar.gz servo-bc7158310ce8abf6605840f1c23013640703e285.zip | |
Auto merge of #8903 - KiChjang:layout-reporter-redirect, r=nox
fix for Layout memory reporter uses pre-redirect url
Rebase of #7612.
Fixes #6872.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8903)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 84c9629ff86..ef9f06aa1c2 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1558,6 +1558,11 @@ impl ScriptTask { /// objects, parses HTML and CSS, and kicks off initial layout. fn load(&self, metadata: Metadata, incomplete: InProgressLoad) -> ParserRoot { let final_url = metadata.final_url.clone(); + { + // send the final url to the layout task. + let LayoutChan(ref chan) = incomplete.layout_chan; + chan.send(layout_interface::Msg::SetFinalUrl(final_url.clone())).unwrap(); + } debug!("ScriptTask: loading {} on page {:?}", incomplete.url.serialize(), incomplete.pipeline_id); // We should either be initializing a root page or loading a child page of an |