From ec6a936f5cd61c1c304d6b1ab76bd3090fc5a56e Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 20 Dec 2018 16:18:34 -0500
Subject: [PATCH] Use incumbent global for postmessage origin check.

---
 components/script/dom/window.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 533db98e05b..bcda545a8cb 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -865,11 +865,7 @@ impl WindowMethods for Window {
         // Step 3-5.
         let origin = match &origin[..] {
             "*" => None,
-            "/" => {
-                // TODO(#12715): Should be the origin of the incumbent settings
-                //               object, not self's.
-                Some(self.Document().origin().immutable().clone())
-            },
+            "/" => Some(source.Document().origin().immutable().clone()),
             url => match ServoUrl::parse(&url) {
                 Ok(url) => Some(url.origin().clone()),
                 Err(_) => return Err(Error::Syntax),