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

Unified Diff: Source/web/WebInputEventConversion.cpp

Issue 920523003: Plumb WebTouchEvent::causesScrollingIfUncanceled to TouchEvent and (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/PlatformTouchEvent.h ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('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 a4a3afa831a8f3cc69bf6cb805cc64fcfe59a630..4df72e3f4659c04fe5b1350f19fec8012a2fd611 100644
--- a/Source/web/WebInputEventConversion.cpp
+++ b/Source/web/WebInputEventConversion.cpp
@@ -446,6 +446,7 @@ PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTo
m_type = toPlatformTouchEventType(event.type);
m_modifiers = toPlatformEventModifiers(event.modifiers);
m_timestamp = event.timeStampSeconds;
+ m_causesScrollingIfUncanceled = event.causesScrollingIfUncanceled;
for (unsigned i = 0; i < event.touchesLength; ++i)
m_touchPoints.append(PlatformTouchPointBuilder(widget, event.touches[i]));
@@ -780,6 +781,7 @@ WebTouchEventBuilder::WebTouchEventBuilder(const Widget* widget, const LayoutObj
modifiers = getWebInputModifiers(event);
timeStampSeconds = event.timeStamp() / millisPerSecond;
cancelable = event.cancelable();
+ causesScrollingIfUncanceled = event.causesScrollingIfUncanceled();
addTouchPointsIfNotYetAdded(widget, toWebTouchPointState(event.type()), event.changedTouches(), touches, &touchesLength, layoutObject);
addTouchPointsIfNotYetAdded(widget, WebTouchPoint::StateStationary, event.touches(), touches, &touchesLength, layoutObject);
« no previous file with comments | « Source/platform/PlatformTouchEvent.h ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698