Improve immersive mode light bar painting

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 226 matching lines @@
 // Max number of images to cache. This has to be at least two since rounding
 // errors may lead to tabs in the same tabstrip having different sizes.
 const size_t kMaxImageCacheSize = 4;
 
 // Height of the colored bar representing the favicon in immersive mode.
 const int kImmersiveBarHeight = 2;
 
 // Distance between the favicon bar and the tab bar in immersive mode.
 const int kImmersiveBarSpacing = 2;
 
+// Color for active and inactive tabs in the immersive mode light strip. These
+// should be similar to the color of the normal art assets for tabs.
+const SkColor kImmersiveActiveTabColor = SkColorSetRGB(230, 230, 230);
+const SkColor kImmersiveInactiveTabColor = SkColorSetRGB(184, 184, 184);
+
 // Scale to resize the current favicon by when projecting.
 const double kProjectingFaviconResizeScale = 0.75;
 
 // Scale to resize the projection sheet glow by.
 const double kProjectingGlowResizeScale = 2.0;
 
 // Draws the icon image at the center of |bounds|.
 void DrawIconCenter(gfx::Canvas* canvas,
                     const gfx::ImageSkia& image,
                     int image_offset,
@@ skipping 771 matching lines @@
     close_button_color_ = title_color;
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(close_button_color_,
         rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
         rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
   }
 }
 
 void Tab::PaintTabImmersive(gfx::Canvas* canvas) {
   // The main bar is as wide as the normal tab's horizontal top line.
-  int main_bar_left = tab_active_.l_width;
-  int main_bar_right = width() - tab_active_.r_width;
+  // This top line of the tab extends a few pixels left and right of the
+  // center image due to pixels in the rounded corner images.
+  const int kBarPadding = 2;
+  int main_bar_left = tab_active_.l_width - kBarPadding;
+  int main_bar_right = width() - tab_active_.r_width + kBarPadding;
 
   bool is_active = IsActive();
   if (ShouldShowIcon()) {
     // Use the favicon's horizontal position.
     gfx::Rect icon_bar_rect(favicon_bounds_.x(), 0,
                             favicon_bounds_.width(), kImmersiveBarHeight);
     canvas->FillRect(icon_bar_rect, icon_dominant_color_);
     // Start the main bar slightly offset from the icon bar.
     main_bar_left = icon_bar_rect.right() + kImmersiveBarSpacing;
   }
 
   // Mini-tabs don't have a main bar.
   if (!data().mini || width() > kMiniTabRendererAsNormalTabWidth) {
     // Active tab has a brighter bar.
-    const TabImage& tab_image =
-        is_active ? tab_immersive_active_ : tab_immersive_inactive_;
-    canvas->DrawImageInt(*tab_image.image_l, main_bar_left, 0);
-    canvas->TileImageInt(*tab_image.image_c,
-        main_bar_left + tab_image.l_width,
-        0,
-        main_bar_right - main_bar_left - tab_image.l_width - tab_image.r_width,
-        tab_image.image_c->height());
-    canvas->DrawImageInt(
-        *tab_image.image_r, main_bar_right - tab_image.r_width, 0);
+    SkColor color =
+        is_active ? kImmersiveActiveTabColor : kImmersiveInactiveTabColor;
+    gfx::Rect main_bar_rect(
+        main_bar_left, 0, main_bar_right - main_bar_left, kImmersiveBarHeight);
+    canvas->FillRect(main_bar_rect, color);
   }
 }
 
 void Tab::PaintTabBackground(gfx::Canvas* canvas) {
   if (IsActive()) {
     PaintActiveTabBackground(canvas);
   } else {
     if (mini_title_animation_.get() && mini_title_animation_->is_animating())
       PaintInactiveTabBackgroundWithTitleChange(canvas);
     else
@@ skipping 553 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();
 }