Bug 1237075 - Navigating from 'manual' to 'auto' session history entry should scroll the page, r=jst

2016-01-06 04:03:42 +02:00
parent 2f2ec6a22a
commit 83f4adb314
2 changed files with 14 additions and 0 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -10072,6 +10072,11 @@ nsDocShell::InternalLoad(nsIURI* aURI,
        }
      }

+      // If we're doing a history load, use its scroll restoration state.
+      if (aSHEntry) {
+        aSHEntry->GetScrollRestorationIsManual(&scrollRestorationIsManual);
+      }
+
      /* Assign mOSHE to mLSHE. This will either be a new entry created
       * by OnNewURI() for normal loads or aSHEntry for history loads.
       */