Change View::HitTest to View::HitTestRect

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 491 matching lines @@
   // Returns the deepest visible descendant that contains the specified point.
   virtual View* GetEventHandlerForPoint(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 MouseEvent& event);
 
-  // Convenience to test whether a point is within this view's bounds
-  virtual bool HitTest(const gfx::Point& l) const;
+  // 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;
 
   // This method is invoked when the user clicks on this view.
   // The provided event is in the receiver's coordinate system.
   //
   // Return true if you processed the event and want to receive subsequent
   // MouseDraggged and MouseReleased events.  This also stops the event from
   // bubbling.  If you return false, the event will bubble through parent
   // views.
   //
   // If you remove yourself from the tree while processing this, event bubbling
@@ skipping 497 matching lines @@
   // view), then reorders the immediate children of that layer to match the
   // order of the view tree.
   virtual void ReorderLayers();
 
   // This reorders the immediate children of |*parent_layer| to match the
   // order of the view tree.
   virtual void ReorderChildLayers(ui::Layer* parent_layer);
 
   // Input ---------------------------------------------------------------------
 
-  // Called by HitTest 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.
+  // 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 HitTest to retrieve a mask for hit-testing against. Subclasses
-  // override to provide custom shaped hit test regions.
+  // Called by HitTestRect() to retrieve a mask for hit-testing against.
+  // Subclasses override to provide custom shaped hit test regions.
   virtual void GetHitTestMask(gfx::Path* mask) const;
 
   // Focus ---------------------------------------------------------------------
 
   // Override to be notified when focus has changed either to or from this View.
   virtual void OnFocus();
   virtual void OnBlur();
 
   // Handle view focus/blur events for this view.
   void Focus();
@@ skipping 419 matching lines @@
   base::win::ScopedComPtr<NativeViewAccessibilityWin>
       native_view_accessibility_win_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_VIEW_H_