From aa329ec78800499cbcb7cceb5b344958d1a29432 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Fri, 9 Nov 2012 16:37:40 -0800
Subject: [PATCH] Bug 806127 - ThirdPartyUtil should not consider in-process
 <iframe mozbrowser/mozapp> to be third-party. r=bz

---
 content/base/src/ThirdPartyUtil.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp
index 97a000e3c9e..2b2718ab42a 100644
--- a/content/base/src/ThirdPartyUtil.cpp
+++ b/content/base/src/ThirdPartyUtil.cpp
@@ -115,7 +115,9 @@ ThirdPartyUtil::IsThirdPartyWindow(nsIDOMWindow* aWindow,
   nsCOMPtr<nsIDOMWindow> current = aWindow, parent;
   nsCOMPtr<nsIURI> parentURI;
   do {
-    rv = current->GetParent(getter_AddRefs(parent));
+    // We use GetScriptableParent rather than GetParent because we consider
+    // <iframe mozbrowser/mozapp> to be a top-level frame.
+    rv = current->GetScriptableParent(getter_AddRefs(parent));
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (SameCOMIdentity(parent, current)) {
@@ -210,7 +212,9 @@ ThirdPartyUtil::IsThirdPartyChannel(nsIChannel* aChannel,
   ctx->GetAssociatedWindow(getter_AddRefs(ourWin));
   if (!ourWin) return NS_ERROR_INVALID_ARG;
 
-  ourWin->GetParent(getter_AddRefs(parentWin));
+  // We use GetScriptableParent rather than GetParent because we consider
+  // <iframe mozbrowser/mozapp> to be a top-level frame.
+  ourWin->GetScriptableParent(getter_AddRefs(parentWin));
   NS_ENSURE_TRUE(parentWin, NS_ERROR_INVALID_ARG);
 
   // Check whether this is the document channel for this window (representing a