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 FIREFOX_52_0b2_BUILD1 FIREFOX_52_0b2_RELEASE
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 27 Jan 2017 08:11:00 +0100
changeset 468764 0f339c1e154f75c484fe2fac507a9a225990d212
parent 468763 4ddd53a5d53033cf03d3ab027f0b58e5fda96216
child 468765 cfe1b04271782572a6bd0e309731e17f3826b378
push id43550
push usermozilla@noorenberghe.ca
push dateTue, 31 Jan 2017 23:11:52 +0000
reviewersbillm, jcristau
bugs1334047
milestone52.0
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
@@ -4301,19 +4301,17 @@ nsDocument::SetScopeObject(nsIGlobalObje
     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;
       mozilla::dom::DocGroup::GetKey(NodePrincipal(), docGroupKey);
-      if (mDocGroup) {
-        MOZ_RELEASE_ASSERT(mDocGroup->MatchesKey(docGroupKey));
-      } else {
+      if (!mDocGroup) {
         mDocGroup = tabgroup->AddDocument(docGroupKey, this);
         MOZ_ASSERT(mDocGroup);
       }
     }
   }
 }
 
 static void