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

Unified Diff: ui/views/view_targeter.cc

Issue 542323002: Convert ui::GestureEvent coordinates during targeting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed 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/events/event_targeter.h ('k') | ui/views/view_targeter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_targeter.cc
diff --git a/ui/views/view_targeter.cc b/ui/views/view_targeter.cc
index a0dcbe0a17cb596b293ce632ed1131f92a0f5b0d..3c5af01909eacd873c1a83b59f52de3af5b128e2 100644
--- a/ui/views/view_targeter.cc
+++ b/ui/views/view_targeter.cc
@@ -39,8 +39,12 @@ ui::EventTarget* ViewTargeter::FindTargetForEvent(ui::EventTarget* root,
*static_cast<ui::ScrollEvent*>(event));
}
- if (event->IsGestureEvent())
- return FindTargetForGestureEvent(view, *(event->AsGestureEvent()));
+ if (event->IsGestureEvent()) {
+ ui::GestureEvent* gesture = event->AsGestureEvent();
+ View* gesture_target = FindTargetForGestureEvent(view, *gesture);
+ root->ConvertEventToTarget(gesture_target, gesture);
+ return gesture_target;
+ }
NOTREACHED() << "ViewTargeter does not yet support this event type.";
return NULL;
@@ -53,8 +57,11 @@ ui::EventTarget* ViewTargeter::FindNextBestTarget(
return NULL;
if (event->IsGestureEvent()) {
- return FindNextBestTargetForGestureEvent(previous_target,
- *(event->AsGestureEvent()));
+ ui::GestureEvent* gesture = event->AsGestureEvent();
+ ui::EventTarget* next_target =
+ FindNextBestTargetForGestureEvent(previous_target, *gesture);
+ previous_target->ConvertEventToTarget(next_target, gesture);
+ return next_target;
}
return previous_target->GetParentTarget();
« no previous file with comments | « ui/events/event_targeter.h ('k') | ui/views/view_targeter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698