Convert ui::GestureEvent coordinates during targeting

ui/events/event_processor.cc

 // Copyright 2013 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/events/event_processor.h"
 
 #include "ui/events/event_target.h"
 #include "ui/events/event_targeter.h"
 
 namespace ui {
 
 EventDispatchDetails EventProcessor::OnEventFromSource(Event* event) {
   EventTarget* root = GetRootTarget();
   CHECK(root);
   EventTargeter* targeter = root->GetEventTargeter();
   CHECK(targeter);
+  PrepareEventForDispatch(event);
 
-  PrepareEventForDispatch(event);
-  EventTarget* target = targeter->FindTargetForEvent(root, event);
+  // If |event| is in the process of being dispatched or has already been
+  // dispatched, then dispatch a copy of the event instead.
+  bool dispatch_original_event = event->phase() == EP_PREDISPATCH;
+  Event* event_to_dispatch = event;
+  scoped_ptr<Event> event_copy;
+  if (!dispatch_original_event) {
+    event_copy = Event::Clone(*event);
+    event_to_dispatch = event_copy.get();
+  }
 
-  // If the event is in the process of being dispatched or has already been
-  // dispatched, then dispatch a copy of the event instead.
-  scoped_ptr<Event> event_copy;
-  if (event->phase() != EP_PREDISPATCH)
-    event_copy = Event::Clone(*event);
+  EventTarget* target = targeter->FindTargetForEvent(root, event_to_dispatch);

[sadrul, 2014/09/07 05:33:47]

Can you update the test in event_processor_unittest.cc to check that the
location of the original event does not change (in
ReDispatchEventHandler::OnMouseEvent()) in this scenario?

[tdanderson, 2014/09/08 17:21:08]

Done.

+  while (target) {
+    EventDispatchDetails details = DispatchEvent(target, event_to_dispatch);
 
-  while (target) {
-    EventDispatchDetails details;
-    if (event_copy) {
-      details = DispatchEvent(target, event_copy.get());
-
-      if (event_copy->stopped_propagation())
+    if (!dispatch_original_event) {
+      if (event_to_dispatch->stopped_propagation())
         event->StopPropagation();
-      else if (event_copy->handled())
+      else if (event_to_dispatch->handled())
         event->SetHandled();
-    } else {
-      details = DispatchEvent(target, event);
     }
 
     if (details.dispatcher_destroyed ||
         details.target_destroyed ||
         event->handled()) {
       return details;
     }
 
-    target = targeter->FindNextBestTarget(target, event);
+    target = targeter->FindNextBestTarget(target, event_to_dispatch);
   }
 
   return EventDispatchDetails();
 }
 
 void EventProcessor::PrepareEventForDispatch(Event* event) {
 }
 
 }  // namespace ui