Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/WebCore/platform/ScrollView.cpp

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/WebCore/platform/PlatformWheelEvent.h ('k') | third_party/WebKit/WebCore/platform/Scrollbar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/platform/ScrollView.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/ScrollView.cpp (revision 11154)
+++ third_party/WebKit/WebCore/platform/ScrollView.cpp (working copy)
@@ -613,10 +613,7 @@
e.accept();
float deltaX = e.deltaX();
float deltaY = e.deltaY();
- if (e.granularity() == ScrollByLineWheelEvent) {
- deltaX *= cMouseWheelPixelsPerLineStep;
- deltaY *= cMouseWheelPixelsPerLineStep;
- } else if (e.granularity() == ScrollByPageWheelEvent) {
+ if (e.granularity() == ScrollByPageWheelEvent) {
ASSERT(deltaX == 0);
bool negative = deltaY < 0;
deltaY = max(0, visibleHeight() - cAmountToKeepWhenPaging);
« no previous file with comments | « third_party/WebKit/WebCore/platform/PlatformWheelEvent.h ('k') | third_party/WebKit/WebCore/platform/Scrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698