Modify hit test masks for tabs and tab close buttons

chrome/browser/ui/views/tabs/tab.cc

 // 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.
 
 #include "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 21 matching lines @@
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/animation_container.h"
 #include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/path.h"
+#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif
 
@@ skipping 183 matching lines @@
 const SkColor kImmersiveActiveTabColor = SkColorSetRGB(235, 235, 235);
 const SkColor kImmersiveInactiveTabColor = SkColorSetRGB(190, 190, 190);
 
 // The minimum opacity (out of 1) when a tab (either active or inactive) is
 // throbbing in the immersive mode light strip.
 const double kImmersiveTabMinThrobOpacity = 0.66;
 
 // Number of steps in the immersive mode loading animation.
 const int kImmersiveLoadingStepCount = 32;
 
+const char kTabCloseButtonName[] = "TabCloseButton";
+
 void DrawIconAtLocation(gfx::Canvas* canvas,
                         const gfx::ImageSkia& image,
                         int image_offset,
                         int dst_x,
                         int dst_y,
                         int icon_width,
                         int icon_height,
                         bool filter,
                         const SkPaint& paint) {
   // NOTE: the clipping is a work around for 69528, it shouldn't be necessary.
@@ skipping 146 matching lines @@
     CustomButton::OnMouseReleased(event);
   }
 
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     // Consume all gesture events here so that the parent (Tab) does not
     // start consuming gestures.
     ImageButton::OnGestureEvent(event);
     event->SetHandled();
   }
 
+  virtual bool HasHitTestMask() const OVERRIDE {
+    return true;
+  }
+
+  virtual void GetHitTestMask(HitTestSource source,
+                              gfx::Path* path) const OVERRIDE {
+    // Use the button's contents bounds (which does not include padding)
+    // and the hit test mask of our parent |tab_| to determine if the
+    // button is hidden behind another tab.
+    gfx::Path tab_mask;
+    tab_->GetHitTestMask(source, &tab_mask);
+
+    gfx::Rect button_bounds(GetContentsBounds());
+    gfx::RectF tab_bounds_f(gfx::SkRectToRectF(tab_mask.getBounds()));
+    views::View::ConvertRectToTarget(tab_, this, &tab_bounds_f);
+    gfx::Rect tab_bounds = gfx::ToEnclosingRect(tab_bounds_f);
+
+    // If the button is hidden behind another tab, the hit test mask is empty.
+    // Otherwise set the hit test mask to be the contents bounds.
+    path->reset();
+    if (tab_bounds.Contains(button_bounds)) {
+      // Include the padding in the hit test mask for touch events.
+      if (source == HIT_TEST_SOURCE_TOUCH)
+        button_bounds = GetLocalBounds();
+
+      path->addRect(RectToSkRect(button_bounds));
+    }
+  }
+
+  virtual const char* GetClassName() const OVERRIDE {
+    return kTabCloseButtonName;
+  }
+
  private:
   Tab* tab_;
 
   DISALLOW_COPY_AND_ASSIGN(TabCloseButton);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageCacheEntry
 
 Tab::ImageCacheEntry::ImageCacheEntry()
@@ skipping 444 matching lines @@
 }
 
 const char* Tab::GetClassName() const {
   return kViewClassName;
 }
 
 bool Tab::HasHitTestMask() const {
   return true;
 }
 
-void Tab::GetHitTestMask(gfx::Path* path) const {
+void Tab::GetHitTestMask(HitTestSource source, gfx::Path* path) const {
   // When the window is maximized we don't want to shave off the edges or top
   // shadow of the tab, such that the user can click anywhere along the top
   // edge of the screen to select a tab. Ditto for immersive fullscreen.
   const views::Widget* widget = GetWidget();
   bool include_top_shadow =
       widget && (widget->IsMaximized() || widget->IsFullscreen());
   TabResources::GetHitTestMask(width(), height(), include_top_shadow, path);
+
+  // It is possible for a portion of the tab to be occluded if tabs are
+  // stacked, so modify the hit test mask to only include the visible
+  // region of the tab.
+  if (controller()) {
+    gfx::Rect clip;
+    controller()->ShouldPaintTab(this, &clip);
+    if (clip.size().GetArea()) {
+      SkRect intersection(path->getBounds());
+      intersection.intersect(RectToSkRect(clip));
+      path->reset();
+      path->addRect(intersection);
+    }
+  }
 }
 
 bool Tab::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
   // TODO(miu): Rectify inconsistent tooltip behavior.  http://crbug.com/310947
 
   if (data_.media_state != TAB_MEDIA_STATE_NONE) {
     *tooltip = chrome::AssembleTabTooltipText(data_.title, data_.media_state);
     return true;
   }
 
@@ skipping 836 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }