[rough WIP] Make View::GetEventHandlerForRect() non-virtual

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 92 matching lines @@
 //   accessed from the main thread.
 //
 /////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT View : public ui::LayerDelegate,
                           public ui::LayerOwner,
                           public ui::AcceleratorTarget,
                           public ui::EventTarget {
  public:
   typedef std::vector<View*> Views;
 
-  // TODO(tdanderson): Becomes obsolete with the refactoring of the event
-  //                   targeting logic for views and windows. See
-  //                   crbug.com/355425.
-  // Specifies the source of the region used in a hit test.
-  // HIT_TEST_SOURCE_MOUSE indicates the hit test is being performed with a
-  // single point and HIT_TEST_SOURCE_TOUCH indicates the hit test is being
-  // performed with a rect larger than a single point. This value can be used,
-  // for example, to add extra padding or change the shape of the hit test mask.
-  enum HitTestSource {
-    HIT_TEST_SOURCE_MOUSE,
-    HIT_TEST_SOURCE_TOUCH
-  };
-
   struct ViewHierarchyChangedDetails {
     ViewHierarchyChangedDetails()
         : is_add(false),
           parent(NULL),
           child(NULL),
           move_view(NULL) {}
 
     ViewHierarchyChangedDetails(bool is_add,
                                 View* parent,
                                 View* child,
@@ skipping 426 matching lines @@
 
   // TODO(tdanderson): GetEventHandlerForPoint() and GetEventHandlerForRect()
   //                   will be removed once their logic is moved into
   //                   ViewTargeter and its derived classes. See
   //                   crbug.com/355425.
 
   // Convenience functions which calls into GetEventHandler() with
   // a 1x1 rect centered at |point|.
   View* GetEventHandlerForPoint(const gfx::Point& point);
 
+  // Terry - update doc
+
   // 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.
-  virtual View* GetEventHandlerForRect(const gfx::Rect& rect);
+  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);
 
-  // TODO(tdanderson): HitTestPoint() and HitTestRect() will be removed once
-  //                   their logic is moved into ViewTargeter and its
-  //                   derived classes. See crbug.com/355425.
-
   // A convenience function which calls HitTestRect() with a rect of size
   // 1x1 and an origin of |point|.
   bool HitTestPoint(const gfx::Point& point) const;
 
-  // Tests whether |rect| intersects this view's bounds.
-  virtual bool HitTestRect(const gfx::Rect& rect) 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.
+  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();
 
   // This method is invoked when the user clicks on this view.
@@ skipping 526 matching lines @@
   // This reorders the immediate children of |*parent_layer| to match the
   // order of the view tree. Child layers which are owned by a view are
   // reordered so that they are below any child layers not owned by a view.
   // Widget::ReorderNativeViews() should be called to reorder any child layers
   // with an associated view. Widget::ReorderNativeViews() may reorder layers
   // below layers owned by a view.
   virtual void ReorderChildLayers(ui::Layer* parent_layer);
 
   // Input ---------------------------------------------------------------------
 
-  // Called by HitTestRect() to see if this View has a custom hit test mask. If
-  // the return value is true, GetHitTestMask() will be called to obtain the
-  // mask. Default value is false, in which case the View will hit-test against
-  // its bounds.
-  virtual bool HasHitTestMask() const;
-
-  // Called by HitTestRect() to retrieve a mask for hit-testing against.
-  // Subclasses override to provide custom shaped hit test regions.
-  // TODO(tdanderson): Remove this method once Tab, TabCloseButton,
-  //                   NewTabButton, and MicButton all implement
-  //                   MaskedViewTargeter.
-  virtual void GetHitTestMaskDeprecated(HitTestSource source,
-                                        gfx::Path* mask) const;
-
   virtual DragInfo* GetDragInfo();
 
   // Focus ---------------------------------------------------------------------
 
   // Returns last value passed to SetFocusable(). Use IsFocusable() to determine
   // if a view can take focus right now.
   bool focusable() const { return focusable_; }
 
   // Override to be notified when focus has changed either to or from this View.
   virtual void OnFocus();
@@ skipping 443 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_