Bug 1144988. r=bz, a=1.4+
authorKyle Huey <khuey@kylehuey.com>
Fri, 20 Mar 2015 19:15:13 -0700
changeset 188797 761495056f96b39dc6fc9803440ffbeb9759f4fb
parent 188796 bfcc1ebed71efde9fc2280a310f4ffc7e7f85e49
child 188798 fbffaa9f6031f4e1ba5a76245d53dcb39c748377
push id842
push userryanvm@gmail.com
push dateMon, 23 Mar 2015 13:57:45 +0000
treeherdermozilla-b2g30_v1_4@761495056f96 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, 1
bugs1144988
milestone30.0
Bug 1144988. r=bz, a=1.4+
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -1319,19 +1319,20 @@ nsDocShell::LoadURI(nsIURI * aURI,
                     bool aFirstParty)
 {
     NS_PRECONDITION(aLoadInfo || (aLoadFlags & EXTRA_LOAD_FLAGS) == 0,
                     "Unexpected flags");
     NS_PRECONDITION((aLoadFlags & 0xf) == 0, "Should not have these flags set");
     
     // Note: we allow loads to get through here even if mFiredUnloadEvent is
     // true; that case will get handled in LoadInternal or LoadHistoryEntry.
-    if (IsPrintingOrPP()) {
+    if (IsPrintingOrPP() || mBlockNavigation) {
       return NS_OK; // JS may not handle returning of an error code
     }
+
     nsCOMPtr<nsIURI> referrer;
     nsCOMPtr<nsIInputStream> postStream;
     nsCOMPtr<nsIInputStream> headersStream;
     nsCOMPtr<nsISupports> owner;
     bool inheritOwner = false;
     bool ownerIsExplicit = false;
     bool sendReferrer = true;
     bool isSrcdoc = false;