webmessaging: add more source info to message

gterzian · gterzian · commit b968142d5682 · 2020-07-05T01:19:35.000+08:00
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
@@ -1845,8 +1845,7 @@ where
                 let result = self
                     .pipelines
                     .get(&pipeline_id)
-                    .and_then(|pipeline| self.browsing_contexts.get(&pipeline.browsing_context_id))
-                    .map(|ctx| (ctx.id, ctx.parent_pipeline_id));
+                    .map(|pipeline| pipeline.browsing_context_id);
                 if let Err(e) = sender.send(result) {
                     warn!(
                         "Sending reply to get browsing context info failed ({:?}).",
@@ -4149,14 +4148,29 @@ where
             },
             Some(browsing_context) => browsing_context.pipeline_id,
         };
-        let source_browsing_context = match self.pipelines.get(&source_pipeline) {
-            Some(pipeline) => pipeline.top_level_browsing_context_id,
-            None => return warn!("PostMessage from closed pipeline {:?}", source_pipeline),
-        };
+
+        let (source_top_level_browsing_context_id, source_browsing_context_id) =
+            match self.pipelines.get(&source_pipeline) {
+                Some(pipeline) => (
+                    pipeline.top_level_browsing_context_id,
+                    pipeline.browsing_context_id,
+                ),
+                None => return warn!("PostMessage from closed pipeline {:?}", source_pipeline),
+            };
+
+        let source_parent = self
+            .browsing_contexts
+            .get(&source_browsing_context_id)
+            .and_then(|bc| bc.parent_pipeline_id)
+            .and_then(|parent_id| self.pipelines.get(&parent_id))
+            .map(|pipeline| pipeline.browsing_context_id);
+
         let msg = ConstellationControlMsg::PostMessage {
             target: pipeline_id,
+            source_parent,
             source: source_pipeline,
-            source_browsing_context: source_browsing_context,
+            source_browsing_context: source_browsing_context_id,
+            source_top_level_browsing_context: source_top_level_browsing_context_id,
             target_origin: origin,
             source_origin,
             data,
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
@@ -1951,15 +1951,19 @@ impl ScriptThread {
             ),
             ConstellationControlMsg::PostMessage {
                 target: target_pipeline_id,
+                source_parent,
                 source: source_pipeline_id,
                 source_browsing_context,
+                source_top_level_browsing_context,
                 target_origin: origin,
                 source_origin,
                 data,
             } => self.handle_post_message_msg(
                 target_pipeline_id,
+                source_parent,
                 source_pipeline_id,
                 source_browsing_context,
+                source_top_level_browsing_context,
                 origin,
                 source_origin,
                 data,
@@ -2605,8 +2609,10 @@ impl ScriptThread {
     fn handle_post_message_msg(
         &self,
         pipeline_id: PipelineId,
+        source_parent: Option<BrowsingContextId>,
         source_pipeline_id: PipelineId,
-        source_browsing_context: TopLevelBrowsingContextId,
+        source_browsing_context: BrowsingContextId,
+        source_top_level_browsing_context: TopLevelBrowsingContextId,
         origin: Option<ImmutableOrigin>,
         source_origin: ImmutableOrigin,
         data: StructuredSerializedData,
@@ -2615,12 +2621,11 @@ impl ScriptThread {
         match window {
             None => return warn!("postMessage after target pipeline {} closed.", pipeline_id),
             Some(window) => {
-                // FIXME: synchronously talks to constellation.
-                // send the required info as part of postmessage instead.
                 let source = match self.remote_window_proxy(
                     &*window.global(),
+                    source_top_level_browsing_context,
                     source_browsing_context,
-                    source_pipeline_id,
+                    source_parent,
                     None,
                 ) {
                     None => {
@@ -3043,20 +3048,6 @@ impl ScriptThread {
         }
     }
 
-    fn ask_constellation_for_browsing_context_info(
-        &self,
-        pipeline_id: PipelineId,
-    ) -> Option<(BrowsingContextId, Option<PipelineId>)> {
-        let (result_sender, result_receiver) = ipc::channel().unwrap();
-        let msg = ScriptMsg::GetBrowsingContextInfo(pipeline_id, result_sender);
-        self.script_sender
-            .send((pipeline_id, msg))
-            .expect("Failed to send to constellation.");
-        result_receiver
-            .recv()
-            .expect("Failed to get browsing context info from constellation.")
-    }
-
     fn ask_constellation_for_top_level_info(
         &self,
         sender_pipeline: PipelineId,
@@ -3082,20 +3073,20 @@ impl ScriptThread {
         &self,
         global_to_clone: &GlobalScope,
         top_level_browsing_context_id: TopLevelBrowsingContextId,
-        pipeline_id: PipelineId,
+        browsing_context_id: BrowsingContextId,
+        parent: Option<BrowsingContextId>,
         opener: Option<BrowsingContextId>,
     ) -> Option<DomRoot<WindowProxy>> {
-        let (browsing_context_id, parent_pipeline_id) =
-            self.ask_constellation_for_browsing_context_info(pipeline_id)?;
         if let Some(window_proxy) = self.window_proxies.borrow().get(&browsing_context_id) {
             return Some(DomRoot::from_ref(window_proxy));
         }
 
-        let parent_browsing_context = parent_pipeline_id.and_then(|parent_id| {
+        let parent_browsing_context = parent.and_then(|parent_bc| {
             self.remote_window_proxy(
                 global_to_clone,
                 top_level_browsing_context_id,
-                parent_id,
+                parent_bc,
+                None,
                 opener,
             )
         });
@@ -3147,12 +3138,24 @@ impl ScriptThread {
         });
         let parent_browsing_context = match (parent_info, iframe.as_ref()) {
             (_, Some(iframe)) => Some(window_from_node(&**iframe).window_proxy()),
-            (Some(parent_id), _) => self.remote_window_proxy(
-                window.upcast(),
-                top_level_browsing_context_id,
-                parent_id,
-                opener,
-            ),
+            (Some(parent_id), _) => {
+                let (result_sender, result_receiver) = ipc::channel().unwrap();
+                let msg = ScriptMsg::GetBrowsingContextInfo(parent_id, result_sender);
+                self.script_sender
+                    .send((parent_id, msg))
+                    .expect("Failed to send to constellation.");
+                let browsing_context_id = result_receiver
+                    .recv()
+                    .expect("Failed to get reply from the constellation.")
+                    .expect("Failed to get browsing context info from constellation.");
+                self.remote_window_proxy(
+                    window.upcast(),
+                    top_level_browsing_context_id,
+                    browsing_context_id,
+                    None,
+                    opener,
+                )
+            },
             _ => None,
         };
 
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
@@ -340,10 +340,14 @@ pub enum ConstellationControlMsg {
     PostMessage {
         /// The target of the message.
         target: PipelineId,
+        /// The parent browsing-context of the source, if any.
+        source_parent: Option<BrowsingContextId>,
         /// The source of the message.
         source: PipelineId,
+        /// The browsing context associated with the source pipeline.
+        source_browsing_context: BrowsingContextId,
         /// The top level browsing context associated with the source pipeline.
-        source_browsing_context: TopLevelBrowsingContextId,
+        source_top_level_browsing_context: TopLevelBrowsingContextId,
         /// The expected origin of the target.
         target_origin: Option<ImmutableOrigin>,
         /// The source origin of the message.
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
@@ -187,11 +187,8 @@ pub enum ScriptMsg {
         IpcSender<Option<TopLevelBrowsingContextId>>,
     ),
     /// Get the browsing context id of the browsing context in which pipeline is
-    /// embedded and the parent pipeline id of that browsing context.
-    GetBrowsingContextInfo(
-        PipelineId,
-        IpcSender<Option<(BrowsingContextId, Option<PipelineId>)>>,
-    ),
+    /// embedded.
+    GetBrowsingContextInfo(PipelineId, IpcSender<Option<BrowsingContextId>>),
     /// Get the nth child browsing context ID for a given browsing context, sorted in tree order.
     GetChildBrowsingContextId(
         BrowsingContextId,
