Move views event targeting into ViewTargeterDelegate::TargetForRect()

ui/views/view.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_VIEWS_VIEW_H_
 #define UI_VIEWS_VIEW_H_
 
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 533 matching lines @@
   // because their drawing logic stays the same and they can become agnostic to
   // the UI directionality.
   void EnableCanvasFlippingForRTLUI(bool enable) {
     flip_canvas_on_paint_for_rtl_ui_ = enable;
   }
 
   // Input ---------------------------------------------------------------------
   // The points, rects, mouse locations, and touch locations in the following
   // functions are in the view's coordinates, except for a RootView.
 
-  // Convenience functions which calls into GetEventHandler() with
-  // a 1x1 rect centered at |point|.
+  // A convenience function which calls into GetEventHandlerForRect() with
+  // a 1x1 rect centered at |point|. |point| is in the local coordinate
+  // space of |this|.
   View* GetEventHandlerForPoint(const gfx::Point& point);
 
-  // If point-based targeting should be used, return the deepest visible
-  // descendant that contains the center point of |rect|.
-  // If rect-based targeting (i.e., fuzzing) should be used, return the
-  // closest visible descendant having at least kRectTargetOverlap of
-  // its area covered by |rect|. If no such descendant exists, return the
-  // deepest visible descendant that contains the center point of |rect|.
-  // See http://goo.gl/3Jp2BD for more information about rect-based targeting.
+  // Returns the View that should be the target of an event having |rect| as
+  // its location, or NULL if no such target exists. |rect| is in the local
+  // coordinate space of |this|.
+  // TODO(tdanderson): Make this function non-virtual.
   virtual View* GetEventHandlerForRect(const gfx::Rect& rect);
 
   // Returns the deepest visible descendant that contains the specified point
   // and supports tooltips. If the view does not contain the point, returns
   // NULL.
   virtual View* GetTooltipHandlerForPoint(const gfx::Point& point);
 
   // Return the cursor that should be used for this view or the default cursor.
   // The event location is in the receiver's coordinate system. The caller is
   // responsible for managing the lifetime of the returned object, though that
   // lifetime may vary from platform to platform. On Windows and Aura,
   // the cursor is a shared resource.
   virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event);
 
   // A convenience function which calls HitTestRect() with a rect of size
-  // 1x1 and an origin of |point|.
+  // 1x1 and an origin of |point|. |point| is in the local coordinate space
+  // of |this|.
   bool HitTestPoint(const gfx::Point& point) const;
 
-  // Tests whether |rect| intersects this view's bounds using the ViewTargeter
-  // installed on |this|. If there is no ViewTargeter installed on |this|, the
-  // ViewTargeter installed on the root view is used instead.
+  // Returns true if |rect| intersects this view's bounds. |rect| is in the
+  // local coordinate space of |this|.
   bool HitTestRect(const gfx::Rect& rect) const;
 
   // Returns true if this view or any of its descendants are permitted to
   // be the target of an event.
   virtual bool CanProcessEventsWithinSubtree() const;
 
   // Returns true if the mouse cursor is over |view| and mouse events are
   // enabled.
   bool IsMouseHovered();
 
@@ skipping 790 matching lines @@
   // Destroys the layer associated with this view, and reparents any descendants
   // to the destroyed layer's parent.
   void DestroyLayer();
 
   // Input ---------------------------------------------------------------------
 
   bool ProcessMousePressed(const ui::MouseEvent& event);
   bool ProcessMouseDragged(const ui::MouseEvent& event);
   void ProcessMouseReleased(const ui::MouseEvent& event);
 
+  // Returns the ViewTargeter installed on |this| if one exists,
+  // otherwise returns the ViewTargeter installed on our root view.
+  // The return value is guaranteed to be non-null.
+  ViewTargeter* GetEffectiveViewTargeter() const;
+
   // Accelerators --------------------------------------------------------------
 
   // Registers this view's keyboard accelerators that are not registered to
   // FocusManager yet, if possible.
   void RegisterPendingAccelerators();
 
   // Unregisters all the keyboard accelerators associated with this view.
   // |leave_data_intact| if true does not remove data from accelerators_ array,
   // so it could be re-registered with other focus manager
   void UnregisterAccelerators(bool leave_data_intact);
@@ skipping 183 matching lines @@
   // Belongs to this view, but it's reference-counted on some platforms
   // so we can't use a scoped_ptr. It's dereferenced in the destructor.
   NativeViewAccessibility* native_view_accessibility_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_VIEW_H_