Remove layout during paint in Tab

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/macros.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"
@@ skipping 107 matching lines @@
     init_params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(init_params);
     widget_->SetContentsView(&parent_);
   }
 
   void TearDown() override {
     widget_.reset();
     views::ViewsTestBase::TearDown();
   }
 
-  // Forces a call to OnPaint() for each tab in |tab_strip_| in order to
-  // trigger a layout, which is needed to update the visibility of tab
-  // close buttons after a tab switch or close. Note that painting does
-  // not occur in unit tests, which is why this helper is used.
-  void TriggerPaintOfAllTabs() {
-    gfx::Canvas canvas;
-    for (int i = 0; i < tab_strip_->tab_count(); ++i)
-      tab_strip_->tab_at(i)->OnPaint(&canvas);
-  }
-
  protected:
   // Returns the rectangular hit test region of |tab| in |tab|'s local
   // coordinate space.
   gfx::Rect GetTabHitTestMask(Tab* tab) {
     views::ViewTargeter* targeter = tab->targeter();
     DCHECK(targeter);
     views::MaskedTargeterDelegate* delegate =
         static_cast<views::MaskedTargeterDelegate*>(tab);
 
     gfx::Path mask;
@@ skipping 287 matching lines @@
   controller_->AddTab(1, true);
   controller_->AddTab(2, false);
   ASSERT_EQ(3, tab_strip_->tab_count());
 
   Tab* tab0 = tab_strip_->tab_at(0);
   Tab* tab1 = tab_strip_->tab_at(1);
   ASSERT_TRUE(tab1->IsActive());
   Tab* tab2 = tab_strip_->tab_at(2);
 
   // Ensure that all tab close buttons are initially visible.
-  TriggerPaintOfAllTabs();
   EXPECT_TRUE(tab0->showing_close_button_);
   EXPECT_TRUE(tab1->showing_close_button_);
   EXPECT_TRUE(tab2->showing_close_button_);
 
   // Enter stacked layout mode and verify this sets |touch_layout_|.
   ASSERT_FALSE(tab_strip_->touch_layout_.get());
   tab_strip_->SetStackedLayout(true);
-  TriggerPaintOfAllTabs();
   ASSERT_TRUE(tab_strip_->touch_layout_.get());
 
   // Only the close button of the active tab should be visible in stacked
   // layout mode.
   EXPECT_FALSE(tab0->showing_close_button_);
   EXPECT_TRUE(tab1->showing_close_button_);
   EXPECT_FALSE(tab2->showing_close_button_);
 
   // An inactive tab added to the tabstrip should not show
   // its tab close button.
   controller_->AddTab(3, false);
   Tab* tab3 = tab_strip_->tab_at(3);
   EXPECT_FALSE(tab0->showing_close_button_);
   EXPECT_TRUE(tab1->showing_close_button_);
   EXPECT_FALSE(tab2->showing_close_button_);
   EXPECT_FALSE(tab3->showing_close_button_);
 
   // After switching tabs, the previously-active tab should have its
   // tab close button hidden and the newly-active tab should show
   // its tab close button.
   tab_strip_->SelectTab(tab2);
-  TriggerPaintOfAllTabs();
   ASSERT_FALSE(tab1->IsActive());
   ASSERT_TRUE(tab2->IsActive());
   EXPECT_FALSE(tab0->showing_close_button_);
   EXPECT_FALSE(tab1->showing_close_button_);
   EXPECT_TRUE(tab2->showing_close_button_);
   EXPECT_FALSE(tab3->showing_close_button_);
 
   // After closing the active tab, the tab which becomes active should
   // show its tab close button.
   tab_strip_->CloseTab(tab1, CLOSE_TAB_FROM_TOUCH);
   tab1 = nullptr;
   ASSERT_TRUE(tab2->IsActive());
-  TriggerPaintOfAllTabs();
   EXPECT_FALSE(tab0->showing_close_button_);
   EXPECT_TRUE(tab2->showing_close_button_);
   EXPECT_FALSE(tab3->showing_close_button_);
 
   // All tab close buttons should be shown when disengaging stacked tab mode.
   tab_strip_->SetStackedLayout(false);
-  TriggerPaintOfAllTabs();
   ASSERT_FALSE(tab_strip_->touch_layout_.get());
   EXPECT_TRUE(tab0->showing_close_button_);
   EXPECT_TRUE(tab2->showing_close_button_);
   EXPECT_TRUE(tab3->showing_close_button_);
 }
 
 TEST_F(TabStripTest, GetEventHandlerForOverlappingArea) {
   tab_strip_->SetBounds(0, 0, 1000, 20);
 
   controller_->AddTab(0, false);
@@ skipping 116 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)));
 }