2 files changed, 9 insertions, 1 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 476f41ef0f1..be39ab71cb2 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -193,6 +193,8 @@ pub struct NewLayoutInfo {
     pub browsing_context_id: BrowsingContextId,
     /// Id of the top-level browsing context associated with this pipeline.
     pub top_level_browsing_context_id: TopLevelBrowsingContextId,
+    /// Id of the opener, if any
+    pub opener: Option<BrowsingContextId>,
     /// Network request data which will be initiated by the script thread.
     pub load_data: LoadData,
     /// Information about the initial window size.
@@ -521,6 +523,8 @@ pub struct InitialScriptState {
     pub browsing_context_id: BrowsingContextId,
     /// The ID of the top-level browsing context this script is part of.
     pub top_level_browsing_context_id: TopLevelBrowsingContextId,
+    /// The ID of the opener, if any.
+    pub opener: Option<BrowsingContextId>,
     /// A channel with which messages can be sent to us (the script thread).
     pub control_chan: IpcSender<ConstellationControlMsg>,
     /// A port on which messages sent by the constellation to script can be received.
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index 3668fd1e2fa..6dba5c00509 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -17,7 +17,8 @@ use embedder_traits::EmbedderMsg;
 use euclid::{Size2D, TypedSize2D};
 use gfx_traits::Epoch;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use msg::constellation_msg::{BrowsingContextId, HistoryStateId, PipelineId, TraversalDirection};
+use msg::constellation_msg::{BrowsingContextId, PipelineId, TopLevelBrowsingContextId};
+use msg::constellation_msg::{HistoryStateId, TraversalDirection};
 use net_traits::CoreResourceMsg;
 use net_traits::request::RequestInit;
 use net_traits::storage_thread::StorageType;
@@ -105,6 +106,8 @@ pub enum ScriptMsg {
     GetBrowsingContextId(PipelineId, IpcSender<Option<BrowsingContextId>>),
     /// Get the parent info for a given pipeline.
     GetParentInfo(PipelineId, IpcSender<Option<PipelineId>>),
+    /// Get the top-level browsing context info for a given browsing context.
+    GetTopForBrowsingContext(BrowsingContextId, IpcSender<Option<TopLevelBrowsingContextId>>),
     /// Get the nth child browsing context ID for a given browsing context, sorted in tree order.
     GetChildBrowsingContextId(BrowsingContextId, usize, IpcSender<Option<BrowsingContextId>>),
     /// All pending loads are complete, and the `load` event for this pipeline
@@ -184,6 +187,7 @@ impl fmt::Debug for ScriptMsg {
             GetClipboardContents(..) => "GetClipboardContents",
             GetBrowsingContextId(..) => "GetBrowsingContextId",
             GetParentInfo(..) => "GetParentInfo",
+            GetTopForBrowsingContext(..) => "GetParentBrowsingContext",
             GetChildBrowsingContextId(..) => "GetChildBrowsingContextId",
             LoadComplete => "LoadComplete",
             LoadUrl(..) => "LoadUrl",