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

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

Issue 619183002: Move check for gesture end events out of RootViewTargeter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment removed Created 6 years, 2 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/root_view_targeter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/root_view.cc
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index 5e703b93faa104d643840b7a211e0c8ee36eaa8b..a1f0813aa3f58a13aa4e14b858836e0b73928a4b 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -261,10 +261,12 @@ void RootView::OnEventProcessingStarted(ui::Event* event) {
return;
}
- // Do not process ui::ET_GESTURE_END events which do not correspond to the
- // removal of the final touch point.
+ // Do not process ui::ET_GESTURE_END events if they do not correspond to the
+ // removal of the final touch point or if no gesture handler has already
+ // been set.
if (gesture_event->type() == ui::ET_GESTURE_END &&
- gesture_event->details().touch_points() > 1) {
+ (gesture_event->details().touch_points() > 1 ||
+ !gesture_handler_)) {
event->SetHandled();
return;
}
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/root_view_targeter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698