Only store the url inside a pipeline instead of the rest of the LoadData.

This commit is contained in:
Josh Matthews 2015-02-19 13:27:21 -05:00
parent e2c4f5ed67
commit 6351fc75fd
13 changed files with 34 additions and 27 deletions

View file

@ -334,9 +334,9 @@ impl NavigationContext {
/// compositor of the new URLs.
fn set_current(&mut self, new_frame: Rc<FrameTree>, compositor_proxy: &mut CompositorProxy) {
self.current = Some(new_frame.clone());
compositor_proxy.send(CompositorMsg::ChangePageLoadData(
compositor_proxy.send(CompositorMsg::ChangePageUrl(
new_frame.id,
new_frame.pipeline.borrow().load_data.clone()));
new_frame.pipeline.borrow().url.clone()));
}
}
@ -762,7 +762,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
source Id of ScriptLoadedURLInIFrameMsg does have an associated pipeline in
constellation. This should be impossible.").clone();
let source_url = source_pipeline.load_data.url.clone();
let source_url = source_pipeline.url.clone();
let same_script = (source_url.host() == url.host() &&
source_url.port() == url.port()) &&