From d31b96be1937cf90acd764d7636efd38358124c5 Mon Sep 17 00:00:00 2001 From: Dave Townsend Date: Fri, 9 Jan 2009 13:46:45 +0000 Subject: [PATCH] Backed out changeset fe759e3fd895 from bug 469613 due to mochitest failures --- layout/generic/test/Makefile.in | 1 - layout/generic/test/test_bug469613.xul | 59 -------------------------- view/src/nsScrollPortView.cpp | 9 ++-- 3 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 layout/generic/test/test_bug469613.xul diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in index 8abda98b2ed2..a67ef7279b6d 100644 --- a/layout/generic/test/Makefile.in +++ b/layout/generic/test/Makefile.in @@ -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 \ diff --git a/layout/generic/test/test_bug469613.xul b/layout/generic/test/test_bug469613.xul deleted file mode 100644 index 1fcbc384c3b7..000000000000 --- a/layout/generic/test/test_bug469613.xul +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - Test for Bug 469613 - - - diff --git a/view/src/nsScrollPortView.cpp b/view/src/nsScrollPortView.cpp index 1e7a3832610e..8f6fb574d0ce 100644 --- a/view/src/nsScrollPortView.cpp +++ b/view/src/nsScrollPortView.cpp @@ -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;