Bug 1145870. r=bz, a=lmandel
authorKyle Huey <khuey@kylehuey.com>
Fri, 20 Mar 2015 19:19:28 -0700
changeset 252084 0725e4cfa3c3
parent 252083 a58b8b594396
child 252085 8358c6c2c417
push id698
push userjlund@mozilla.com
push date2015-03-23 22:08 +0000
treeherdermozilla-release@b0c0ae7b02a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, lmandel
bugs1145870
milestone37.0
Bug 1145870. r=bz, a=lmandel
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9403,16 +9403,18 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                          nsISHEntry * aSHEntry,
                          bool aFirstParty,
                          const nsAString &aSrcdoc,
                          nsIDocShell* aSourceDocShell,
                          nsIURI* aBaseURI,
                          nsIDocShell** aDocShell,
                          nsIRequest** aRequest)
 {
+    MOZ_RELEASE_ASSERT(!mBlockNavigation);
+
     nsresult rv = NS_OK;
     mOriginalUriString.Truncate();
 
 #ifdef PR_LOGGING
     if (gDocShellLeakLog && PR_LOG_TEST(gDocShellLeakLog, PR_LOG_DEBUG)) {
         nsAutoCString spec;
         if (aURI)
             aURI->GetSpec(spec);