Bug 469613 - Page scrolling by clicking the scrollbar track can get stuck if the page is very long, r+sr=roc

This commit is contained in:
Markus Stange 2009-01-24 16:47:17 +01:00
parent ced35c38b3
commit d93c06d57d
3 changed files with 90 additions and 8 deletions

View File

@ -65,6 +65,7 @@ _TEST_FILES = test_bug288789.html \
test_bug448860.html \
test_bug460532.html \
test_bug468167.html \
test_bug469613.xul \
test_character_movement.html \
test_word_movement.html \
test_backspace_delete.html \

View File

@ -0,0 +1,89 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=469613
-->
<window title="Mozilla Bug 469613"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<title>Test for Bug 469613</title>
<script type="application/javascript" src="/MochiKit/packed.js" />
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"/>
<body xmlns="http://www.w3.org/1999/xhtml">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=469613">Mozilla Bug 469613</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
</body>
<vbox style="height: 100px; overflow: auto;" id="scrollbox">
<hbox style="height: 200px;"/>
</vbox>
<script class="testbody" type="application/javascript;version=1.7"><![CDATA[
/** Test for Bug 469613 **/
function doTest() {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
let scrollbox = document.getElementById("scrollbox");
scrollbox.scrollTop = 0;
// Make sure that the "scroll focus" is inside the scrollbox by moving the
// mouse in the scrollbox.
synthesizeMouse(scrollbox, 6, 6, { type: "mousemove" });
synthesizeMouse(scrollbox, 8, 8, { type: "mousemove" });
// Now scroll 10px down.
synthesizeMouseScroll(scrollbox, 10, 10, {axis:"vertical", delta:10, type:"MozMousePixelScroll"});
// Send a 0-delta scroll.
synthesizeMouseScroll(scrollbox, 10, 10, {axis:"vertical", delta:0, type:"MozMousePixelScroll"});
setTimeout(function() {
// Check if the 10px were scrolled.
is(scrollbox.scrollTop, 10, "Starting a 0-delta scroll shouldn't cancel a pending async scroll.");
// Second test
scrollbox.scrollTop = 20;
// Start an async scroll to 30.
synthesizeMouseScroll(scrollbox, 10, 10, {axis:"vertical", delta:10, type:"MozMousePixelScroll"});
// Start a sync scroll to 30.
scrollbox.scrollTop = 30;
is(scrollbox.scrollTop, 30, "Setting scrollTop should have immediate effect, even if there was a pending async scroll to the same position.");
// Third test
scrollbox.scrollTop = 40;
// Start an async scroll to 50.
synthesizeMouseScroll(scrollbox, 10, 10, {axis:"vertical", delta:10, type:"MozMousePixelScroll"});
// Cancel the async scroll.
scrollbox.scrollTop = 40;
// Send a 0-delta scroll.
synthesizeMouseScroll(scrollbox, 10, 10, {axis:"vertical", delta:0, type:"MozMousePixelScroll"});
setTimeout(function() {
is(scrollbox.scrollTop, 40, "Canceling an async scroll should reset the point of reference for relative scrolls (mDestinationX/Y).");
SimpleTest.finish();
}, 0);
}, 0);
}
SimpleTest.waitForExplicitFinish();
addLoadEvent(function() setTimeout(doTest, 0));
]]></script>
</window>

View File

@ -243,14 +243,6 @@ static nsresult ClampScrollValues(nscoord& aX, nscoord& aY, nsScrollPortView* aT
NS_IMETHODIMP nsScrollPortView::ScrollTo(nscoord aDestinationX, nscoord aDestinationY,
PRUint32 aUpdateFlags)
{
// do nothing if the we aren't scrolling.
if (aDestinationX == mDestinationX && aDestinationY == mDestinationY) {
// kill any in-progress smooth scroll
delete mAsyncScroll;
mAsyncScroll = nsnull;
return NS_OK;
}
mDestinationX = aDestinationX;
mDestinationY = aDestinationY;
ClampScrollValues(mDestinationX, mDestinationY, this);