Remove layout during paint in Tab

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

Index: chrome/browser/ui/views/tabs/tab.cc
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 8313719bd8881a6c1db6df5af3d1ee5abd372b52..f0e0722e0bed1e3637b37cb55e46f2eeb9d679ab 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -545,6 +545,7 @@ bool Tab::IsActive() const {
 void Tab::ActiveStateChanged() {
   OnButtonColorMaybeChanged();
   media_indicator_button_->UpdateEnabledForMuteToggle();
+  Layout();

[sky, 2016/01/08 16:40:32]

Can we call layout only if we actually need to?

[enne (OOO), 2016/01/08 18:22:27]

Can you and miu sort out what you want to do here? Patch 1 had a conditional
here, but miu didn't want it.

 }
 
 bool Tab::IsSelected() const {
@@ -1176,18 +1177,9 @@ void Tab::DataChanged(const TabRendererData& old) {
 }
 
 void Tab::PaintTab(gfx::Canvas* canvas) {
-  // See if the model changes whether the icons should be painted.
-  const bool show_icon = ShouldShowIcon();
-  const bool show_media_indicator = ShouldShowMediaIndicator();
-  const bool show_close_button = ShouldShowCloseBox();
-  if (show_icon != showing_icon_ ||
-      show_media_indicator != showing_media_indicator_ ||
-      show_close_button != showing_close_button_)
-    Layout();
-
   PaintTabBackground(canvas);
 
-  if (show_icon)
+  if (showing_icon_)
     PaintIcon(canvas);
 }