Title: [122480] branches/chromium/1180/Source/WebCore/platform/ScrollAnimator.cpp
- Revision
- 122480
- Author
- rjkro...@chromium.org
- Date
- 2012-07-12 10:33:48 -0700 (Thu, 12 Jul 2012)
Log Message
Merge 122382 - [chromium] [regression] Don't use ScrollByPrecisePixels on Chromium Mac.
https://bugs.webkit.org/show_bug.cgi?id=91020
Reviewed by Adam Barth.
A change in https://bugs.webkit.org/show_bug.cgi?id=87535 to
improve the operation of smooth scrolling incorrectly caused
Chromium Mac to use the wrong scroll granularity on
hasPreciseScrollingDeltas() == true wheelevent scrolls.
Exclude the change on the Chromium Mac platform.
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::handleWheelEvent): Adjusted #ifdef to exclude Chromium
Mac from ScrollByPrecisePixels change.
TBR=rjkro...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10693166
Modified Paths
Diff
Modified: branches/chromium/1180/Source/WebCore/platform/ScrollAnimator.cpp (122479 => 122480)
--- branches/chromium/1180/Source/WebCore/platform/ScrollAnimator.cpp 2012-07-12 17:29:42 UTC (rev 122479)
+++ branches/chromium/1180/Source/WebCore/platform/ScrollAnimator.cpp 2012-07-12 17:33:48 UTC (rev 122480)
@@ -91,7 +91,7 @@
bool handled = false;
-#if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM) && !OS(DARWIN)
ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel;
#else
ScrollGranularity granularity = ScrollByPixel;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
