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

Unified Diff: ui/events/blink/blink_event_util.cc

Issue 1645613007: Redefined the bit WebTouchEvent.causesScrollingIfUncanceled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed an aura unittest. Created 4 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
Index: ui/events/blink/blink_event_util.cc
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index d268662044ba9063821ef47fd0253efdd1615f4d..b4e2f55a75ad133112b4e18401f2f9ad822d44f0 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -179,7 +179,7 @@ WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
blink::WebTouchEvent CreateWebTouchEventFromMotionEvent(
const MotionEvent& event,
- bool may_cause_scrolling) {
+ bool moved_beyond_slop_region) {
static_assert(static_cast<int>(MotionEvent::MAX_TOUCH_POINT_COUNT) ==
static_cast<int>(blink::WebTouchEvent::touchesLengthCap),
"inconsistent maximum number of active touch points");
@@ -189,8 +189,8 @@ blink::WebTouchEvent CreateWebTouchEventFromMotionEvent(
result.type = ToWebInputEventType(event.GetAction());
result.cancelable = (result.type != WebInputEvent::TouchCancel);
result.timeStampSeconds =
- (event.GetEventTime() - base::TimeTicks()).InSecondsF(),
- result.causesScrollingIfUncanceled = may_cause_scrolling;
+ (event.GetEventTime() - base::TimeTicks()).InSecondsF();
+ result.movedBeyondSlopRegion = moved_beyond_slop_region;
result.modifiers = EventFlagsToWebEventModifiers(event.GetFlags());
DCHECK_NE(event.GetUniqueEventId(), 0U);
result.uniqueTouchEventId = event.GetUniqueEventId();
« no previous file with comments | « ui/aura/window_event_dispatcher_unittest.cc ('k') | ui/events/gesture_detection/filtered_gesture_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698