[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:22:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e5ae95fbc25e961fe6aca3c7bfb21b02158ac310
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 13 08:20:59 2010 +0000
2010-09-13 Patrick Gansterer <paroga at paroga.com>
Reviewed by Kenneth Rohde Christiansen.
[WINCE] Buildfix for ScrollAnimatorWin
https://bugs.webkit.org/show_bug.cgi?id=45595
Use fabs() instead of abs().
* platform/ScrollAnimatorWin.cpp:
(WebCore::ScrollAnimatorWin::scroll):
(WebCore::ScrollAnimatorWin::animateScroll):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67369 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dbd323e..21147ca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-13 Patrick Gansterer <paroga at paroga.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [WINCE] Buildfix for ScrollAnimatorWin
+ https://bugs.webkit.org/show_bug.cgi?id=45595
+
+ Use fabs() instead of abs().
+
+ * platform/ScrollAnimatorWin.cpp:
+ (WebCore::ScrollAnimatorWin::scroll):
+ (WebCore::ScrollAnimatorWin::animateScroll):
+
2010-09-13 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/platform/ScrollAnimatorWin.cpp b/WebCore/platform/ScrollAnimatorWin.cpp
index 8b7d0f6..f4bf5d2 100644
--- a/WebCore/platform/ScrollAnimatorWin.cpp
+++ b/WebCore/platform/ScrollAnimatorWin.cpp
@@ -128,7 +128,7 @@ bool ScrollAnimatorWin::scroll(ScrollbarOrientation orientation, ScrollGranulari
// velocity needed to stay smoothly in sync with the user's actions; for
// events that come slower, we'll scroll one increment and then pause until
// the next event fires.
- float animationStep = abs(newPos - *data->m_currentPos);
+ float animationStep = fabs(newPos - *data->m_currentPos);
// If a key is held down (or the wheel continually spun), then once we have
// reached a velocity close to the steady-state velocity, we're likely to
// hit the desired position at around the same time we'd expect the next
@@ -275,7 +275,7 @@ void ScrollAnimatorWin::animateScroll(PerAxisData* data)
}
// Now update the scroll position based on the distance traveled.
- if (distanceTraveled >= abs(data->m_desiredPos - *data->m_currentPos)) {
+ if (distanceTraveled >= fabs(data->m_desiredPos - *data->m_currentPos)) {
// We've traveled far enough to reach the desired position. Stop smooth
// scrolling.
*data->m_currentPos = data->m_desiredPos;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list