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

Unified Diff: ui/views/widget/root_view_targeter.cc

Issue 533793002: Only target ui::ET_GESTURE_END to the default gesture handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/root_view_targeter.cc
diff --git a/ui/views/widget/root_view_targeter.cc b/ui/views/widget/root_view_targeter.cc
index 3c4b9e21c40587d021e1e8c0a680d83684babf8c..78e007d988a72e97c52005aa902332b79c54563c 100644
--- a/ui/views/widget/root_view_targeter.cc
+++ b/ui/views/widget/root_view_targeter.cc
@@ -31,6 +31,11 @@ View* RootViewTargeter::FindTargetForGestureEvent(
return root_view_->gesture_handler_;
}
+ // If no default gesture handler has already been set, do not perform any
+ // targeting for a ET_GESTURE_END event.
+ if (gesture.type() == ui::ET_GESTURE_END)
+ return NULL;
+
// If rect-based targeting is enabled, use the gesture's bounding box to
// determine the target. Otherwise use the center point of the gesture's
// bounding box to determine the target.
@@ -49,6 +54,12 @@ View* RootViewTargeter::FindTargetForGestureEvent(
ui::EventTarget* RootViewTargeter::FindNextBestTargetForGestureEvent(
ui::EventTarget* previous_target,
const ui::GestureEvent& gesture) {
+ // ET_GESTURE_END events should only ever be targeted to the default
+ // gesture handler set by a previous gesture, if one exists. Thus we do not
+ // permit any re-targeting of ET_GESTURE_END events.
+ if (gesture.type() == ui::ET_GESTURE_END)
+ return NULL;
+
// GESTURE_SCROLL_BEGIN events are always permitted to be re-targeted, even
// if |allow_gesture_event_retargeting_| is false.
if (!root_view_->allow_gesture_event_retargeting_ &&
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698