Finish merging backout of changeset 50ea31d46c0e
authorBlake Kaplan <mrbkap@gmail.com>
Thu, 22 Jul 2010 21:31:10 -0700
changeset 48118 2addd3953801997e9994689ed83d510f075fb425
parent 48116 a4b7ad2f48544e3308cef59a126e2940e5089560 (current diff)
parent 48117 f6b9b3f87e3098f19ff21838dd57a2fa57cb9350 (diff)
child 48119 05a194f6de30fb8694bc5e4c98b56eeb9092c885
child 49340 ff11c8a1815fd00543a5d03b38f35b7e08f97d4c
push id14579
push usermrbkap@mozilla.com
push dateFri, 23 Jul 2010 04:31:24 +0000
treeherdermozilla-central@2addd3953801 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b3pre
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
Finish merging backout of changeset 50ea31d46c0e
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -8992,41 +8992,31 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIC
     // Check if the url to be loaded is the same as the one already loaded.
     if (mCurrentURI)
         aURI->Equals(mCurrentURI, &equalUri);
 
 #ifdef DEBUG
     PR_LOG(gDocShellLog, PR_LOG_DEBUG,
            ("  shAvailable=%i updateHistory=%i equalURI=%i\n",
             shAvailable, updateHistory, equalUri));
-
-    if (mCurrentURI && !mOSHE) {
-        NS_ASSERTION(IsAboutBlank(mCurrentURI), "no SHEntry for a non-transient viewer?");
-    }
 #endif
 
     /* If the url to be loaded is the same as the one already there,
      * and the original loadType is LOAD_NORMAL, LOAD_LINK, or
      * LOAD_STOP_CONTENT, set loadType to LOAD_NORMAL_REPLACE so that
      * AddToSessionHistory() won't mess with the current SHEntry and
      * if this page has any frame children, it also will be handled
      * properly. see bug 83684
      *
-     * NB: If mOSHE is null but we have a current URI, then it means
-     * that we must be at the transient about:blank content viewer
-     * (asserted above) and we should let the normal load continue,
-     * since there's nothing to replace.
-     *
      * XXX Hopefully changing the loadType at this time will not hurt  
      *  anywhere. The other way to take care of sequentially repeating
      *  frameset pages is to add new methods to nsIDocShellTreeItem.
      * Hopefully I don't have to do that. 
      */
     if (equalUri &&
-        mOSHE &&
         (mLoadType == LOAD_NORMAL ||
          mLoadType == LOAD_LINK ||
          mLoadType == LOAD_STOP_CONTENT) &&
         !inputStream)
     {
         mLoadType = LOAD_NORMAL_REPLACE;
     }