fixup! Bug #13670.1: Isolate favicon requests by first party

arthuredelstein · Sep 17, 2015 · 1f39237 · 1f39237
1 parent 45666d6
commit 1f39237
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
@@ -5042,7 +5042,7 @@
                      class="tab-throbber"
                      role="presentation"
                      layer="true" />
-          <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed,firstparty"
+          <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed"
                      anonid="tab-icon-image"
                      class="tab-icon-image"
                      validate="never"
@@ -5286,6 +5286,7 @@
             aMenuitem.setAttribute("busy", aTab.getAttribute("busy"));
             aMenuitem.removeAttribute("image");
           } else {
+            aMenuitem.setAttribute("firstparty", aTab.getAttribute("firstparty"));
             aMenuitem.setAttribute("image", aTab.getAttribute("image"));
             aMenuitem.removeAttribute("busy");
           }

diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp
@@ -593,16 +593,22 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel,
   // to a particular web site should be assigned that site's first party.
   if (aNode && aNode->IsElement() && aNode->OwnerDoc() &&
       nsContentUtils::IsChromeDoc(aNode->OwnerDoc())) {
-    nsString firstparty;
-    aNode->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty);
-    if (!firstparty.IsEmpty()) {
-      nsCOMPtr<nsIURI> tempURI;
-      rv = NS_NewURI(getter_AddRefs(tempURI), firstparty);
-      if (rv != NS_OK) {
-        return rv;
-      } else {
-        NS_ADDREF(*aOutput = tempURI);
-        return NS_OK;
+    nsTArray<nsINode*> nodeAncestors;
+    nsContentUtils::GetAncestors(aNode, nodeAncestors);
+    for (nsINode* nodeAncestor : nodeAncestors) {
+      if (nodeAncestor->IsElement()) {
+        nsString firstparty;
+        nodeAncestor->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty);
+        if (!firstparty.IsEmpty()) {
+          nsCOMPtr<nsIURI> tempURI;
+          rv = NS_NewURI(getter_AddRefs(tempURI), firstparty);
+          if (rv != NS_OK) {
+            return rv;
+          } else {
+            NS_ADDREF(*aOutput = tempURI);
+            return NS_OK;
+          }
+        }
       }
     }
   }