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 952 matching lines @@
   // to scroll. ScrollView interprets a return value of 0 (or negative)
   // to scroll by a default amount.
   //
   // See VariableRowHeightScrollHelper and FixedRowHeightScrollHelper for
   // implementations of common cases.
   virtual int GetPageScrollIncrement(ScrollView* scroll_view,
                                      bool is_horizontal, bool is_positive);
   virtual int GetLineScrollIncrement(ScrollView* scroll_view,
                                      bool is_horizontal, bool is_positive);
 
+  // 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 {

[tdanderson, 2013/10/24 20:56:24]

Is there a better place for this enum? I needed to make it public so that it
could be accessed by the unit test.

[sky, 2013/10/24 22:13:38]

I think this is the best place, but move it above struct
ViewHierarchyChangedDetails (style guide says enums at beginning of section).
And do we really only use these two? I'm surprised there aren't other random
bits of code that use it.

[tdanderson, 2013/10/25 00:10:52]

Done. And yes, as far as I know this is all we need.

+    HIT_TEST_SOURCE_MOUSE,
+    HIT_TEST_SOURCE_TOUCH
+  };
+
  protected:
   // Used to track a drag. RootView passes this into
   // ProcessMousePressed/Dragged.
   struct DragInfo {
     // Sets possible_drag to false and start_x/y to 0. This is invoked by
     // RootView prior to invoke ProcessMousePressed.
     void Reset();
 
     // Sets possible_drag to true and start_pt to the specified point.
     // This is invoked by the target view if it detects the press may generate
@@ skipping 136 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(gfx::Path* mask,
+      HitTestSource source = HIT_TEST_SOURCE_MOUSE) 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_