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

Unified Diff: third_party/WebKit/Source/web/WebInputEventConversion.cpp

Issue 1888163003: Articulate the cancel behavior in the WebTouchEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
Index: third_party/WebKit/Source/web/WebInputEventConversion.cpp
diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.cpp b/third_party/WebKit/Source/web/WebInputEventConversion.cpp
index b020b0fefe2505da660ce60447e3fab4555fcdfd..52ed837267f405b91058a18f9a3ff85eea0cee51 100644
--- a/third_party/WebKit/Source/web/WebInputEventConversion.cpp
+++ b/third_party/WebKit/Source/web/WebInputEventConversion.cpp
@@ -457,7 +457,7 @@ PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTo
for (unsigned i = 0; i < event.touchesLength; ++i)
m_touchPoints.append(PlatformTouchPointBuilder(widget, event.touches[i]));
- m_cancelable = event.cancelable;
+ m_cancelable = event.dispatchType == WebInputEvent::Blocking;
}
static FloatPoint convertAbsoluteLocationForLayoutObjectFloat(const LayoutPoint& location, const LayoutObject& layoutObject)
@@ -717,7 +717,7 @@ WebTouchEventBuilder::WebTouchEventBuilder(const LayoutObject* layoutObject, con
timeStampSeconds = event.platformTimeStamp();
modifiers = event.modifiers();
- cancelable = event.cancelable();
+ dispatchType = event.cancelable() ? WebInputEvent::Blocking : WebInputEvent::NonBlocking;
movedBeyondSlopRegion = event.causesScrollingIfUncanceled();
// Currently touches[] is empty, add stationary points as-is.

Powered by Google App Engine
This is Rietveld 408576698