Bug 1334047 - Remove the release assertion for docgroup keys matching until we fix the code to adhere to this (branch fix); r=billm a=jcristau
☠☠ backed out by 13afabf5d79d ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 27 Jan 2017 08:11:00 +0100
changeset 375740 e72aaa3b621e51a2563cf72335813b1a05bd7c23
parent 375739 dacf10cb5b872db5f5b0ed87ed96014a2b61952c
child 375741 763b172e23b91074d2b212c6693497c29e274be9
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm, jcristau
bugs1334047
milestone53.0a2
Bug 1334047 - Remove the release assertion for docgroup keys matching until we fix the code to adhere to this (branch fix); r=billm a=jcristau
dom/base/nsDocument.cpp
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -4394,23 +4394,18 @@ nsDocument::SetScopeObject(nsIGlobalObje
     nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(aGlobal);
     if (window) {
       // We want to get the tabgroup unconditionally, such that we can make
       // certain that it is cached in the inner window early enough.
       mozilla::dom::TabGroup* tabgroup = window->TabGroup();
       // We should already have the principal, and now that we have been added to a
       // window, we should be able to join a DocGroup!
       nsAutoCString docGroupKey;
-      nsresult rv =
-        mozilla::dom::DocGroup::GetKey(NodePrincipal(), docGroupKey);
-      if (mDocGroup) {
-        if (NS_SUCCEEDED(rv)) {
-          MOZ_RELEASE_ASSERT(mDocGroup->MatchesKey(docGroupKey));
-        }
-      } else {
+      mozilla::dom::DocGroup::GetKey(NodePrincipal(), docGroupKey);
+      if (!mDocGroup) {
         mDocGroup = tabgroup->AddDocument(docGroupKey, this);
         MOZ_ASSERT(mDocGroup);
       }
     }
   }
 }
 
 static void