Bug 1250033 - DocShell shouldn't have any child when setting userContextId. r=sicking
☠☠ backed out by 7adbdf0fce9a ☠ ☠
authorYoshi Huang <allstars.chh@mozilla.com>
Fri, 06 May 2016 22:44:43 +0800
changeset 296558 e7bfb11e947d34734090deb83d0391fc50cd5f06
parent 296557 45acc6a022912f3be4c79f13efa584365d848888
child 296559 076df0206f544046125624e8d08979698d1ebc24
push id30241
push usercbook@mozilla.com
push dateMon, 09 May 2016 09:18:37 +0000
treeherdermozilla-central@748b70bcdbc9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs1250033
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1250033 - DocShell shouldn't have any child when setting userContextId. r=sicking
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -14074,16 +14074,17 @@ nsDocShell::GetOriginAttributes(JSContex
   bool ok = ToJSValue(aCx, mOriginAttributes, aVal);
   NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
   return NS_OK;
 }
 
 void
 nsDocShell::SetOriginAttributes(const DocShellOriginAttributes& aAttrs)
 {
+  MOZ_ASSERT(mChildList.Length() == 0);
   mOriginAttributes = aAttrs;
 }
 
 NS_IMETHODIMP
 nsDocShell::SetOriginAttributes(JS::Handle<JS::Value> aOriginAttributes,
                                 JSContext* aCx)
 {
   DocShellOriginAttributes attrs;