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 dacf10cb5b87 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 27 Jan 2017 08:11:00 +0100
changeset 378022 0411363a0dc7d350ac731edc047e3c6f3ef51c1d
parent 378021 1d9713abc2cfcbbb8e1724dbb55b07efab093e17
child 378023 dacf10cb5b872db5f5b0ed87ed96014a2b61952c
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [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
@@ -4396,21 +4396,17 @@ nsDocument::SetScopeObject(nsIGlobalObje
       // 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 {
+      if (!mDocGroup) {
         mDocGroup = tabgroup->AddDocument(docGroupKey, this);
         MOZ_ASSERT(mDocGroup);
       }
     }
   }
 }
 
 static void