Use the incumbent global as the source of x-origin postMessage

servo · Apr 10, 2018 · cef3f0e · cef3f0e
1 parent 07dd37a
commit cef3f0e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs
@@ -192,9 +192,13 @@ impl DissimilarOriginWindowMethods for DissimilarOriginWindow {
 
 impl DissimilarOriginWindow {
     pub fn post_message(&self, origin: Option<ImmutableOrigin>, data: StructuredCloneData) {
+        let incumbent = match GlobalScope::incumbent() {
+            None => return warn!("postMessage called with no incumbent global"),
+            Some(incumbent) => incumbent,
+        };
         let msg = ScriptMsg::PostMessage(self.window_proxy.browsing_context_id(),
                                                 origin,
                                                 data.move_to_arraybuffer());
-        let _ = self.upcast::<GlobalScope>().script_to_constellation_chan().send(msg);
+        let _ = incumbent.script_to_constellation_chan().send(msg);
     }
 }