Merge backout
authorKyle Huey <khuey@kylehuey.com>
Wed, 10 Aug 2011 09:49:36 -0400
changeset 72771 db65b6cd69e4d0dc1c628b1c5cabf5eb7963daac
parent 72769 04411da717901c27f45ce295628ee4efb07fb742 (current diff)
parent 72770 5cf936e830cf1c99f7931e99c6d52bee5edfd055 (diff)
child 72773 0bf3da55f665f8af56c42c1e16f8016d7e895b5a
push id301
push userkhuey@mozilla.com
push dateWed, 10 Aug 2011 13:52:09 +0000
treeherdermozilla-aurora@0bf3da55f665 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone7.0a2
Merge backout
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9559,19 +9559,19 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIC
                 (void)NS_GetReferrerFromChannel(aChannel,
                                                 getter_AddRefs(referrer));
 
                 AddURIVisit(aURI, referrer, previousURI, previousFlags);
             }
         }
     }
 
-    // If this was a history load or a refresh,
-    // update the index in SH. 
-    if (rootSH && (mLoadType & (LOAD_CMD_HISTORY | LOAD_CMD_RELOAD))) {
+    // If this was a history load, update the index in 
+    // SH. 
+    if (rootSH && (mLoadType & LOAD_CMD_HISTORY)) {
         nsCOMPtr<nsISHistoryInternal> shInternal(do_QueryInterface(rootSH));
         if (shInternal) {
             rootSH->GetIndex(&mPreviousTransIndex);
             shInternal->UpdateIndex();
             rootSH->GetIndex(&mLoadedTransIndex);
 #ifdef DEBUG_PAGE_CACHE
             printf("Previous index: %d, Loaded index: %d\n\n",
                    mPreviousTransIndex, mLoadedTransIndex);