Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / events / event_processor.cc

diff --git a/src/ui/events/event_processor.cc b/src/ui/events/event_processor.cc
index 3077cc8..b508508 100644 (file)
--- a/src/ui/events/event_processor.cc
+++ b/src/ui/events/event_processor.cc
@@ -15,24 +15,49 @@ EventDispatchDetails EventProcessor::OnEventFromSource(Event* event) {
   EventTargeter* targeter = root->GetEventTargeter();
   CHECK(targeter);
 
-  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();
+  }
+
+  OnEventProcessingStarted(event_to_dispatch);
+  EventTarget* target = NULL;
+  if (!event_to_dispatch->handled())
+    target = targeter->FindTargetForEvent(root, event_to_dispatch);
 
+  EventDispatchDetails details;
   while (target) {
-    EventDispatchDetails details = DispatchEvent(target, event);
-    if (details.dispatcher_destroyed ||
-        details.target_destroyed ||
-        event->handled()) {
-      return details;
+    details = DispatchEvent(target, event_to_dispatch);
+
+    if (!dispatch_original_event) {
+      if (event_to_dispatch->stopped_propagation())
+        event->StopPropagation();
+      else if (event_to_dispatch->handled())
+        event->SetHandled();
     }
 
-    target = targeter->FindNextBestTarget(target, event);
+    if (details.dispatcher_destroyed)
+      return details;
+
+    if (details.target_destroyed || event->handled())
+      break;
+
+    target = targeter->FindNextBestTarget(target, event_to_dispatch);
   }
 
-  return EventDispatchDetails();
+  OnEventProcessingFinished(event);
+  return details;
+}
+
+void EventProcessor::OnEventProcessingStarted(Event* event) {
 }
 
-void EventProcessor::PrepareEventForDispatch(Event* event) {
+void EventProcessor::OnEventProcessingFinished(Event* event) {
 }
 
 }  // namespace ui