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

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

Issue 533323004: Remove RootView::DispatchGestureEvent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test added, member name changed 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/widget/root_view.cc ('k') | no next file » | 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 78e007d988a72e97c52005aa902332b79c54563c..aaa661b8d52cc3d4b00935a5f7e179a785250c42 100644
--- a/ui/views/widget/root_view_targeter.cc
+++ b/ui/views/widget/root_view_targeter.cc
@@ -27,7 +27,7 @@ View* RootViewTargeter::FindTargetForGestureEvent(
// Return the default gesture handler if one is already set.
if (root_view_->gesture_handler_) {
- CHECK(!root_view_->allow_gesture_event_retargeting_);
+ CHECK(root_view_->gesture_handler_set_before_processing_);
return root_view_->gesture_handler_;
}
@@ -60,9 +60,10 @@ ui::EventTarget* RootViewTargeter::FindNextBestTargetForGestureEvent(
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_ &&
+ // Prohibit re-targeting of gesture events (except for GESTURE_SCROLL_BEGIN
+ // events) if the default gesture handler was set by the dispatch of a
+ // previous gesture event.
+ if (root_view_->gesture_handler_set_before_processing_ &&
gesture.type() != ui::ET_GESTURE_SCROLL_BEGIN) {
return NULL;
}
« no previous file with comments | « ui/views/widget/root_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698