Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset fe759e3fd895 from bug 469613 due to mochitest failures

Browse Source
This commit is contained in:
Dave Townsend 2009-01-09 13:46:45 +00:00
parent e57134dd74
commit d31b96be19
3 changed files with 3 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layout/generic/test/Makefile.in
View File

@ -65,7 +65,6 @@ _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 \

59
layout/generic/test/test_bug469613.xul
View File

@ -1,59 +0,0 @@
<?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: 120px;"/>
</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.")
SimpleTest.finish();
}, 0);
}
SimpleTest.waitForExplicitFinish();
addLoadEvent(doTest);
]]></script>
</window>

9
view/src/nsScrollPortView.cpp
View File

@ -243,12 +243,9 @@ static nsresult ClampScrollValues(nscoord& aX, nscoord& aY, nsScrollPortView* aT
NS_IMETHODIMP nsScrollPortView::ScrollTo(nscoord aDestinationX, nscoord aDestinationY,
PRUint32 aUpdateFlags)
{
// Do nothing if the target scroll position hasn't changed.
if (aDestinationX == mDestinationX && aDestinationY == mDestinationY)
return NS_OK;
if (aDestinationX == mOffsetX && aDestinationY == mOffsetY) {
// Kill any in-progress async scroll.
// 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;