Refactors away method implementations in ui::EventTargeter

ui/events/event_targeter.cc

Index: ui/events/event_targeter.cc
diff --git a/ui/events/event_targeter.cc b/ui/events/event_targeter.cc
index 5d43b29ba941114c7357ea8c930800d8272dff64..f141c5423ad0eae87c26d909cc268e450882eb1b 100644
--- a/ui/events/event_targeter.cc
+++ b/ui/events/event_targeter.cc
@@ -10,49 +10,49 @@
 
 namespace ui {
 
+namespace {
+
+bool IsLocatedEvent(const ui::Event& event) {

[tdanderson, 2015/05/07 01:01:26]

It looks like this is already implemented in event.h.

[varkha, 2015/05/07 01:15:30]

Yes, acq. I'll change that here and in WindowTargeter that I've stolen this
from.

+  return event.IsMouseEvent() || event.IsTouchEvent() ||
+         event.IsScrollEvent() || event.IsGestureEvent();
+}
+
+}  // namespace
+
 EventTargeter::~EventTargeter() {
 }
 
 EventTarget* EventTargeter::FindTargetForEvent(EventTarget* root,
                                                Event* event) {
-  if (event->IsMouseEvent() ||
-      event->IsScrollEvent() ||
-      event->IsTouchEvent() ||
-      event->IsGestureEvent()) {
-    return FindTargetForLocatedEvent(root,
-                                     static_cast<LocatedEvent*>(event));
-  }
-  return root;
-}
+  if (!IsLocatedEvent(*event))
+    return root;
+  LocatedEvent* located_event = static_cast<LocatedEvent*>(event);
 
-EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root,
-                                                      LocatedEvent* event) {
-  scoped_ptr<EventTargetIterator> iter = root->GetChildIterator();
+  scoped_ptr<ui::EventTargetIterator> iter = root->GetChildIterator();
   if (iter) {
-    EventTarget* target = root;
-    for (EventTarget* child = iter->GetNextTarget(); child;
+    ui::EventTarget* target = root;
+    for (ui::EventTarget* child = iter->GetNextTarget(); child;
          child = iter->GetNextTarget()) {
       EventTargeter* targeter = child->GetEventTargeter();
       if (!targeter)
         targeter = this;
-      if (!targeter->SubtreeShouldBeExploredForEvent(child, *event))
+      if (!targeter->SubtreeShouldBeExploredForEvent(child, *located_event))
         continue;
-      target->ConvertEventToTarget(child, event);
+      target->ConvertEventToTarget(child, located_event);
       target = child;
-      EventTarget* child_target =
-          targeter->FindTargetForLocatedEvent(child, event);
+      ui::EventTarget* child_target =
+          targeter->FindTargetForEvent(child, located_event);
       if (child_target)
         return child_target;
     }
-    target->ConvertEventToTarget(root, event);
+    target->ConvertEventToTarget(root, located_event);
   }
   return root->CanAcceptEvent(*event) ? root : NULL;
 }
 
 bool EventTargeter::SubtreeShouldBeExploredForEvent(EventTarget* target,
                                                     const LocatedEvent& event) {
-  return SubtreeCanAcceptEvent(target, event) &&
-         EventLocationInsideBounds(target, event);
+  return true;
 }
 
 EventTarget* EventTargeter::FindNextBestTarget(EventTarget* previous_target,
@@ -60,14 +60,4 @@ EventTarget* EventTargeter::FindNextBestTarget(EventTarget* previous_target,
   return NULL;
 }
 
-bool EventTargeter::SubtreeCanAcceptEvent(EventTarget* target,
-                                          const LocatedEvent& event) const {
-  return true;
-}
-
-bool EventTargeter::EventLocationInsideBounds(EventTarget* target,
-                                              const LocatedEvent& event) const {
-  return true;
-}
-
 }  // namespace ui