Convert ui::GestureEvent coordinates during targeting

ui/views/view_targeter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/view_targeter.h"
 
 #include "ui/events/event_target.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter_delegate.h"
@@ skipping 21 matching lines @@
   View* view = static_cast<View*>(root);
 
   if (event->IsKeyEvent())
     return FindTargetForKeyEvent(view, *static_cast<ui::KeyEvent*>(event));
 
   if (event->IsScrollEvent()) {
     return FindTargetForScrollEvent(view,
                                     *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;
 }
 
 ui::EventTarget* ViewTargeter::FindNextBestTarget(
     ui::EventTarget* previous_target,
     ui::Event* event) {
   if (!previous_target)
     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();
 }
 
 bool ViewTargeter::SubtreeCanAcceptEvent(
     ui::EventTarget* target,
     const ui::LocatedEvent& event) const {
   NOTREACHED();
   return false;
@@ skipping 30 matching lines @@
 }
 
 ui::EventTarget* ViewTargeter::FindNextBestTargetForGestureEvent(
     ui::EventTarget* previous_target,
     const ui::GestureEvent& gesture) {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace views