Bug 1186774 - Scroll position (scrollX/scrollY) should be restored after popstate, not before, r=bz

--HG-- extra : rebase_source : e5b3a1bae24adf174777d35847576c61242e221e
2015-08-28 22:25:54 +03:00 · 2015-08-28 22:25:54 +03:00 · 942f1a8ca8
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@ -9989,11 +9989,12 @@ nsDocShell::InternalLoad(nsIURI* aURI,
      /* restore previous position of scroller(s), if we're moving
       * back in history (bug 59774)
       */
+      nscoord bx, by;
+      bool needsScrollPosUpdate = false;
      if (mOSHE && (aLoadType == LOAD_HISTORY ||
                    aLoadType == LOAD_RELOAD_NORMAL)) {
-        nscoord bx, by;
+        needsScrollPosUpdate = true;
        mOSHE->GetScrollPosition(&bx, &by);
-        SetCurScrollPosEx(bx, by);
      }

      // Dispatch the popstate and hashchange events, as appropriate.
@ -10009,6 +10010,10 @@ nsDocShell::InternalLoad(nsIURI* aURI,
          win->DispatchSyncPopState();
        }

+        if (needsScrollPosUpdate && win->HasActiveDocument()) {
+          SetCurScrollPosEx(bx, by);
+        }
+
        if (doHashchange) {
          // Note that currentURI hasn't changed because it's on the
          // stack, so we can just use it directly as the old URI.
--- a/docshell/test/mochitest.ini
+++ b/docshell/test/mochitest.ini
@ -99,6 +99,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug797909.html]
 [test_bug1045096.html]
+[test_bug1186774.html]
 [test_framedhistoryframes.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage, and also bug 784321
 support-files = file_framedhistoryframes.html
--- a/docshell/test/test_bug1186774.html
+++ b/docshell/test/test_bug1186774.html
@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1186774
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1186774</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test for Bug 1186774 **/
+
+var child;
+
+function runTest() {
+  child = window.open("data:text/html,<div style='height: 9000px;'></div>", "", "width=100,height=100");
+  child.onload = function() {
+    setTimeout(function() {
+      child.scrollTo(0, 0);
+      child.history.pushState({}, "initial");
+      child.scrollTo(0, 3000);
+      child.history.pushState({}, "scrolled");
+      child.scrollTo(0, 6000);
+      child.history.back();
+    });
+  }
+
+  child.onpopstate = function() {
+    is(child.scrollY,  6000, "Shouldn't have scrolled before popstate");
+    child.close();
+    SimpleTest.finish();
+  }
+}
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(runTest);
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1186774">Mozilla Bug 1186774</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>