Merge 249331 "Tab close buttons can only be targeted with touch ..."

chrome/browser/ui/views/tabs/tab_strip_unittest.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_strip.h"
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ skipping 244 matching lines @@
   Tab* most_right_tab = tab_strip_->tab_at(3);
   most_right_tab->SetBoundsRect(gfx::Rect(gfx::Point(450, 0),
                                           gfx::Size(200, 20)));
 
   // Switch to stacked layout mode and force a layout to ensure tabs stack.
   tab_strip_->SetLayoutType(TAB_STRIP_LAYOUT_STACKED, false);
   tab_strip_->DoLayout();
 
 
   // Tests involving |left_tab|, which has part of its bounds and its tab
-  // close button occluded by |active_tab|.
+  // close button completely occluded by |active_tab|.
 
   // Bounds of the tab's hit test mask.
   gfx::Rect tab_bounds = GetTabHitTestMask(left_tab);
   EXPECT_EQ(gfx::Rect(6, 2, 61, 27).ToString(), tab_bounds.ToString());
 
   // Bounds of the tab close button (without padding) in the tab's
   // coordinate space.
   gfx::Rect contents_bounds = GetTabCloseHitTestMask(left_tab, false);
   // TODO(tdanderson): Uncomment this line once crbug.com/311609 is resolved.
   //EXPECT_EQ(gfx::Rect(84, 8, 18, 18).ToString(), contents_bounds.ToString());
 
-  // Verify that the tab close button is occluded.
+  // Verify that the tab close button is completely occluded.
   EXPECT_FALSE(tab_bounds.Contains(contents_bounds));
 
   // Hit tests in the non-occuluded region of the tab.
   EXPECT_TRUE(left_tab->HitTestRect(gfx::Rect(6, 2, 2, 2)));
   EXPECT_TRUE(left_tab->HitTestRect(gfx::Rect(6, 2, 1, 1)));
   EXPECT_TRUE(left_tab->HitTestRect(gfx::Rect(30, 15, 1, 1)));
   EXPECT_TRUE(left_tab->HitTestRect(gfx::Rect(30, 15, 25, 35)));
   EXPECT_TRUE(left_tab->HitTestRect(gfx::Rect(-10, -5, 20, 30)));
 
   // Hit tests in the occluded region of the tab.
@@ skipping 27 matching lines @@
 
   // Bounds of the tab close button (without padding) in the tab's
   // coordinate space.
   gfx::Rect local_bounds = GetTabCloseHitTestMask(active_tab, true);
   EXPECT_EQ(gfx::Rect(81, 0, 39, 29).ToString(), local_bounds.ToString());
 
   // Hit tests within the tab.
   EXPECT_TRUE(active_tab->HitTestRect(gfx::Rect(30, 15, 1, 1)));
   EXPECT_TRUE(active_tab->HitTestRect(gfx::Rect(30, 15, 2, 2)));
 
-  // Hit tests against the tab close button. Note that if the hit test
-  // source is a mouse, a hit test within the button's padding should fail.
+  // Hit tests against the tab close button. Note that hit tests from either
+  // mouse or touch should both fail if they are strictly contained within
+  // the button's padding.
   views::ImageButton* active_close = active_tab->close_button_;
   EXPECT_FALSE(active_close->HitTestRect(gfx::Rect(1, 1, 1, 1)));
-  EXPECT_TRUE(active_close->HitTestRect(gfx::Rect(1, 1, 2, 2)));
+  EXPECT_FALSE(active_close->HitTestRect(gfx::Rect(1, 1, 2, 2)));
   EXPECT_TRUE(active_close->HitTestRect(gfx::Rect(10, 10, 1, 1)));
   EXPECT_TRUE(active_close->HitTestRect(gfx::Rect(10, 10, 25, 35)));
 
 
   // Tests involving |most_right_tab|, which has part of its bounds occluded
   // by |right_tab| but has its tab close button completely visible.
 
   tab_bounds = GetTabHitTestMask(most_right_tab);
   EXPECT_EQ(gfx::Rect(84, 2, 30, 27).ToString(), tab_bounds.ToString());
   contents_bounds = GetTabCloseHitTestMask(active_tab, false);
   // TODO(tdanderson): Uncomment this line once crbug.com/311609 is resolved.
   //EXPECT_EQ(gfx::Rect(84, 8, 18, 18).ToString(), contents_bounds.ToString());
   local_bounds = GetTabCloseHitTestMask(active_tab, true);
   EXPECT_EQ(gfx::Rect(81, 0, 39, 29).ToString(), local_bounds.ToString());
 
   // Verify that the tab close button is not occluded.
   EXPECT_TRUE(tab_bounds.Contains(contents_bounds));
 
   // Hit tests in the occluded region of the tab.
   EXPECT_FALSE(most_right_tab->HitTestRect(gfx::Rect(20, 15, 1, 1)));
   EXPECT_FALSE(most_right_tab->HitTestRect(gfx::Rect(20, 15, 5, 6)));
 
   // Hit tests in the non-occluded region of the tab.
   EXPECT_TRUE(most_right_tab->HitTestRect(gfx::Rect(85, 15, 1, 1)));
   EXPECT_TRUE(most_right_tab->HitTestRect(gfx::Rect(85, 15, 2, 2)));
 
-  // Hit tests against the tab close button. Note that if the hit test
-  // source is a mouse, a hit test within the button's padding should fail.
+  // Hit tests against the tab close button. Note that hit tests from either
+  // mouse or touch should both fail if they are strictly contained within
+  // the button's padding.
   views::ImageButton* most_right_close = most_right_tab->close_button_;
   EXPECT_FALSE(most_right_close->HitTestRect(gfx::Rect(1, 1, 1, 1)));
-  EXPECT_TRUE(most_right_close->HitTestRect(gfx::Rect(1, 1, 2, 2)));
+  EXPECT_FALSE(most_right_close->HitTestRect(gfx::Rect(1, 1, 2, 2)));
   EXPECT_TRUE(most_right_close->HitTestRect(gfx::Rect(10, 10, 1, 1)));
   EXPECT_TRUE(most_right_close->HitTestRect(gfx::Rect(10, 10, 25, 35)));
   EXPECT_TRUE(most_right_close->HitTestRect(gfx::Rect(-10, 10, 25, 35)));
 }
 
+// Creates a tab strip in stacked layout mode and verifies the correctness
+// of hit tests against the visible/occluded region of a partially-occluded
+// tab close button.
+TEST_F(TabStripTest, ClippedTabCloseButton) {
+  tab_strip_->SetBounds(0, 0, 220, 20);
+
+  controller_->AddTab(0, false);
+  controller_->AddTab(1, true);
+  ASSERT_EQ(2, tab_strip_->tab_count());
+
+  Tab* left_tab = tab_strip_->tab_at(0);
+  left_tab->SetBoundsRect(gfx::Rect(gfx::Point(0, 0), gfx::Size(200, 20)));
+
+  Tab* active_tab = tab_strip_->tab_at(1);
+  active_tab->SetBoundsRect(gfx::Rect(gfx::Point(180, 0), gfx::Size(200, 20)));
+  ASSERT_TRUE(active_tab->IsActive());
+
+  // Switch to stacked layout mode and force a layout to ensure tabs stack.
+  tab_strip_->SetLayoutType(TAB_STRIP_LAYOUT_STACKED, false);
+  tab_strip_->DoLayout();
+
+
+  // Tests involving |left_tab|, which has part of its bounds and its tab
+  // close button partially occluded by |active_tab|.
+
+  // Bounds of the tab's hit test mask.
+  gfx::Rect tab_bounds = GetTabHitTestMask(left_tab);
+  EXPECT_EQ(gfx::Rect(6, 2, 91, 27).ToString(), tab_bounds.ToString());
+
+  // Bounds of the tab close button (without padding) in the tab's
+  // coordinate space.
+  gfx::Rect contents_bounds = GetTabCloseHitTestMask(left_tab, false);
+  // TODO(tdanderson): Uncomment this line once crbug.com/311609 is resolved.
+  //EXPECT_EQ(gfx::Rect(84, 8, 18, 18).ToString(), contents_bounds.ToString());
+
+  // Verify that the tab close button is only partially occluded.
+  EXPECT_FALSE(tab_bounds.Contains(contents_bounds));
+  EXPECT_TRUE(tab_bounds.Intersects(contents_bounds));
+
+  views::ImageButton* left_close = left_tab->close_button_;
+
+  // Hit tests from mouse should return true if and only if the location
+  // is within a visible region.
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(2, 15, 1, 1)));
+  EXPECT_TRUE(left_close->HitTestRect(gfx::Rect(3, 15, 1, 1)));
+  EXPECT_TRUE(left_close->HitTestRect(gfx::Rect(10, 10, 1, 1)));
+  EXPECT_TRUE(left_close->HitTestRect(gfx::Rect(15, 12, 1, 1)));
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(16, 10, 1, 1)));
+
+  // All hit tests from touch should return false because the button is
+  // not fully visible.
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(2, 15, 2, 2)));
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(3, 15, 25, 25)));
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(10, 10, 4, 5)));
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(15, 12, 2, 2)));
+  EXPECT_FALSE(left_close->HitTestRect(gfx::Rect(16, 10, 20, 20)));
+}
+
 TEST_F(TabStripTest, GetEventHandlerForOverlappingArea) {
   tab_strip_->SetBounds(0, 0, 1000, 20);
 
   controller_->AddTab(0, false);
   controller_->AddTab(1, true);
   controller_->AddTab(2, false);
   controller_->AddTab(3, false);
   ASSERT_EQ(4, tab_strip_->tab_count());
 
   // Verify that the active tab will be a tooltip handler for points that hit
@@ skipping 110 matching lines @@
   ASSERT_TRUE(IsPointInTab(most_right_tab, unactive_overlap));
 
   EXPECT_EQ(
       right_tab,
       FindTabView(tab_strip_->GetTooltipHandlerForPoint(unactive_overlap)));
 
   // Confirm that tab strip doe not return tooltip handler for points that
   // don't hit it.
   EXPECT_FALSE(tab_strip_->GetTooltipHandlerForPoint(gfx::Point(-1, 2)));
 }