Bug 478927 - Add a new flag LOCATION_CHANGE_ERROR_PAGE for onLocationChangeBug. r=smaug, sr=bzbarsky

2012-05-03 06:22:32 -04:00
parent e50a15f2e2
commit d8f727008c
2 changed files with 21 additions and 6 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7535,14 +7535,14 @@ nsDocShell::CreateContentViewer(const char *aContentType,

        // Create an shistory entry for the old load.
        if (failedURI) {
-#ifdef DEBUG
            bool errorOnLocationChangeNeeded =
-#endif
-            OnNewURI(failedURI, failedChannel, nsnull, mLoadType, true, false,
-                     false);
+                OnNewURI(failedURI, failedChannel, nsnull, mLoadType, false,
+                         false, false);

-            MOZ_ASSERT(!errorOnLocationChangeNeeded,
-                       "We have to fire onLocationChange again.");
+            if (errorOnLocationChangeNeeded) {
+                FireOnLocationChange(this, failedChannel, failedURI,
+                                     LOCATION_CHANGE_ERROR_PAGE);
+            }
        }

        // Be sure to have a correct mLSHE, it may have been cleared by