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

Unified Diff: Source/web/WebInputEventConversion.cpp

Issue 850443002: Scroll Customization Prototype (Not for review, WIP) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase / cleanup / minor bug fixes Created 5 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 | « Source/platform/PlatformGestureEvent.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebInputEventConversion.cpp
diff --git a/Source/web/WebInputEventConversion.cpp b/Source/web/WebInputEventConversion.cpp
index 4df72e3f4659c04fe5b1350f19fec8012a2fd611..586f507bde224f8cd301b6da75dbafbf1ae907b0 100644
--- a/Source/web/WebInputEventConversion.cpp
+++ b/Source/web/WebInputEventConversion.cpp
@@ -225,11 +225,12 @@ PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W
break;
case WebInputEvent::GestureScrollUpdate:
m_type = PlatformEvent::GestureScrollUpdate;
- m_data.m_scrollUpdate.m_deltaX = scaleDeltaToWindow(widget, e.data.scrollUpdate.deltaX);
- m_data.m_scrollUpdate.m_deltaY = scaleDeltaToWindow(widget, e.data.scrollUpdate.deltaY);
- m_data.m_scrollUpdate.m_velocityX = e.data.scrollUpdate.velocityX;
- m_data.m_scrollUpdate.m_velocityY = e.data.scrollUpdate.velocityY;
- m_data.m_scrollUpdate.m_preventPropagation = e.data.scrollUpdate.preventPropagation;
+ m_data.m_scroll.m_deltaX = scaleDeltaToWindow(widget, e.data.scrollUpdate.deltaX);
+ m_data.m_scroll.m_deltaY = scaleDeltaToWindow(widget, e.data.scrollUpdate.deltaY);
+ m_data.m_scroll.m_velocityX = e.data.scrollUpdate.velocityX;
+ m_data.m_scroll.m_velocityY = e.data.scrollUpdate.velocityY;
+ m_data.m_scroll.m_preventPropagation = e.data.scrollUpdate.preventPropagation;
+ m_data.m_scroll.m_inertial = e.data.scrollUpdate.inertial;
break;
case WebInputEvent::GestureTap:
m_type = PlatformEvent::GestureTap;
« no previous file with comments | « Source/platform/PlatformGestureEvent.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698