Modify hit test masks for tabs and tab close buttons

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 90 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;
 
+  // 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 {

[Ben Goodger (Google), 2013/10/28 20:23:29]

let's not add this to views. Instead we should delegate more of this to the
client.

[tdanderson, 2013/10/29 17:30:01]

I moved this to ui/views/rect_based_targeting_utils.h for the time being, and
will be moving all of rect_based_targeting_utils to ui/events (so they are in
the ui:: namespace) in a follow up patch: crbug.com/305795

+    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 998 matching lines @@
   // 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.
-  virtual void GetHitTestMask(gfx::Path* mask) const;
+  virtual void GetHitTestMask(HitTestSource source, gfx::Path* mask) const;
 
   virtual DragInfo* GetDragInfo();
 
   // 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.
@@ skipping 412 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_