Bug 849219 - Store the scroll state also when the position is 0,0 to avoid scrolling to an #ID on reload. r=roc

This commit is contained in:
Mats Palmgren 2013-03-15 23:32:35 +01:00
parent 5ad7b9425b
commit d9494408fd
3 changed files with 52 additions and 9 deletions

View File

@ -146,6 +146,7 @@ MOCHITEST_FILES = \
test_bug842853-2.html \
file_bug842853.sjs \
file_bug842853.html \
test_bug849219.html \
$(NULL)
# Tests for bugs 441782, 467672 and 570378 don't pass reliably on Windows, because of bug 469208

View File

@ -0,0 +1,50 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=849219
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 849219</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 849219 **/
SimpleTest.waitForExplicitFinish();
function runTest() {
var win = e.contentWindow;
if (win.location.hash != '') {
is(win.scrollY,0);
SimpleTest.finish();
return;
}
win.location.hash='#anchor'
win.scrollTo(0,0);
win.location.reload()
}
</script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=849219">Mozilla Bug 849219</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
<script>
var e = document.createElement('iframe');
var url = 'data:text/html,<a href="%23anchor">Click to scroll to anchor</a><div style="height:5000px"></div><a name="anchor">FAIL</a>'
e.setAttribute('src',url);
e.setAttribute('onload','runTest()');
document.body.appendChild(e);
</script>
</body>
</html>

View File

@ -3886,16 +3886,8 @@ nsGfxScrollFrameInner::SaveState()
return nullptr;
}
nsPoint scrollPos = GetLogicalScrollPosition();
// Don't save scroll position if we are at (0,0)
if (scrollPos == nsPoint(0,0)) {
return nullptr;
}
nsPresState* state = new nsPresState();
state->SetScrollState(scrollPos);
state->SetScrollState(GetLogicalScrollPosition());
return state;
}