diff options
Diffstat (limited to 'components/constellation/pipeline.rs')
| -rw-r--r-- | components/constellation/pipeline.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 01c386779bb..85fdc54289b 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -15,7 +15,7 @@ use ipc_channel::Error; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; use layout_traits::LayoutThreadFactory; -use msg::constellation_msg::{BrowsingContextId, FrameType, PipelineId, PipelineNamespaceId}; +use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, FrameType, PipelineId, PipelineNamespaceId}; use net::image_cache::ImageCacheImpl; use net_traits::{IpcSend, ResourceThreads}; use net_traits::image_cache::ImageCache; @@ -104,7 +104,7 @@ pub struct InitialPipelineState { pub browsing_context_id: BrowsingContextId, /// The ID of the top-level browsing context that contains this Pipeline. - pub top_level_browsing_context_id: BrowsingContextId, + pub top_level_browsing_context_id: TopLevelBrowsingContextId, /// The ID of the parent pipeline and frame type, if any. /// If `None`, this is the root. @@ -201,6 +201,7 @@ impl Pipeline { parent_info: state.parent_info, new_pipeline_id: state.id, browsing_context_id: state.browsing_context_id, + top_level_browsing_context_id: state.top_level_browsing_context_id, load_data: state.load_data, window_size: window_size, pipeline_port: pipeline_port, @@ -393,7 +394,7 @@ impl Pipeline { /// This will cause an event to be fired on an iframe in the document, /// or on the `Window` if no frame is given. pub fn trigger_mozbrowser_event(&self, - child_id: Option<BrowsingContextId>, + child_id: Option<TopLevelBrowsingContextId>, event: MozBrowserEvent) { assert!(PREFS.is_mozbrowser_enabled()); @@ -433,8 +434,8 @@ impl Pipeline { #[derive(Deserialize, Serialize)] pub struct UnprivilegedPipelineContent { id: PipelineId, + top_level_browsing_context_id: TopLevelBrowsingContextId, browsing_context_id: BrowsingContextId, - top_level_browsing_context_id: BrowsingContextId, parent_info: Option<(PipelineId, FrameType)>, constellation_chan: IpcSender<ScriptMsg>, layout_to_constellation_chan: IpcSender<LayoutMsg>, @@ -491,7 +492,7 @@ impl UnprivilegedPipelineContent { }, self.load_data.clone()); LTF::create(self.id, - Some(self.top_level_browsing_context_id), + self.top_level_browsing_context_id, self.load_data.url, self.parent_info.is_some(), layout_pair, |