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

Unified Diff: ui/events/gesture_detection/filtered_gesture_provider.cc

Issue 1645613007: Redefined the bit WebTouchEvent.causesScrollingIfUncanceled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 11 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/gesture_detection/filtered_gesture_provider.cc
diff --git a/ui/events/gesture_detection/filtered_gesture_provider.cc b/ui/events/gesture_detection/filtered_gesture_provider.cc
index e616e7bbd64f3f60aa8fa15a53dcba1529b05b65..644c8a9112db1823841d727e54d0db76f039a909 100644
--- a/ui/events/gesture_detection/filtered_gesture_provider.cc
+++ b/ui/events/gesture_detection/filtered_gesture_provider.cc
@@ -11,7 +11,7 @@
namespace ui {
FilteredGestureProvider::TouchHandlingResult::TouchHandlingResult()
- : succeeded(false), did_generate_scroll(false) {
+ : succeeded(false), moved_beyond_slop_region(false) {
}
FilteredGestureProvider::FilteredGestureProvider(
@@ -21,7 +21,7 @@ FilteredGestureProvider::FilteredGestureProvider(
gesture_provider_(config, this),
gesture_filter_(this),
handling_event_(false),
- last_touch_event_did_generate_scroll_(false) {
+ last_touch_event_moved_beyond_slop_region_(false) {
}
FilteredGestureProvider::TouchHandlingResult
@@ -30,7 +30,7 @@ FilteredGestureProvider::OnTouchEvent(const MotionEvent& event) {
base::AutoReset<bool> handling_event(&handling_event_, true);
pending_gesture_packet_ = GestureEventDataPacket::FromTouch(event);
- last_touch_event_did_generate_scroll_ = false;
+ last_touch_event_moved_beyond_slop_region_ = false;
if (!gesture_provider_.OnTouchEvent(event))
return TouchHandlingResult();
@@ -43,7 +43,7 @@ FilteredGestureProvider::OnTouchEvent(const MotionEvent& event) {
TouchHandlingResult result;
result.succeeded = true;
- result.did_generate_scroll = last_touch_event_did_generate_scroll_;
+ result.moved_beyond_slop_region = last_touch_event_moved_beyond_slop_region_;
return result;
}
@@ -79,7 +79,7 @@ void FilteredGestureProvider::OnGestureEvent(const GestureEventData& event) {
if (event.details.type() == ui::ET_GESTURE_SCROLL_BEGIN ||
event.details.type() == ui::ET_GESTURE_SCROLL_UPDATE ||
event.details.type() == ui::ET_SCROLL_FLING_START) {
- last_touch_event_did_generate_scroll_ = true;
+ last_touch_event_moved_beyond_slop_region_ = true;
}
pending_gesture_packet_.Push(event);
return;

Powered by Google App Engine
This is Rietveld 408576698