Fix tab coloring bugs with multiple open profiles which used different colors.

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 <stddef.h>
 #include <limits>
 #include <utility>
 
@@ skipping 77 matching lines @@
 
 // Inactive selected tabs have their throb value scaled by this.
 const double kSelectedTabThrobScale = 0.95 - kSelectedTabOpacity;
 
 // Offset from the right edge for the start of the pinned title change
 // animation.
 const int kPinnedTitleChangeInitialXOffset = 6;
 
 // 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;
+// 8 = normal/incognito, active/inactive, 2 sizes within tabstrip.
+const size_t kMaxImageCacheSize = 8;
 
 // Height of the miniature tab strip in immersive mode.
 const int kImmersiveTabHeight = 3;
 
 // Height of the small tab indicator rectangles in immersive mode.
 const int kImmersiveBarHeight = 2;
 
 // Color for active and inactive tabs in the immersive mode light strip. These
 // should be a little brighter than the color of the normal art assets for tabs,
 // which for active tabs is 230, 230, 230 and for inactive is 184, 184, 184.
@@ skipping 294 matching lines @@
         canvas, bounds,
         tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING),
         base::TimeTicks::Now() - loading_start_time_, &waiting_state_);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Tab::ImageCacheEntryMetadata
 
 struct Tab::ImageCacheEntryMetadata {
-  ImageCacheEntryMetadata(bool incognito,
-                          int resource_id,
+  ImageCacheEntryMetadata(int resource_id,
+                          SkColor fill_color,
+                          SkColor stroke_color,
                           ui::ScaleFactor scale_factor,
                           const gfx::Size& size);
+
   ~ImageCacheEntryMetadata();
 
   // Making this a non-member would require a friend declaration in Tab.  Bleh.
   bool operator==(const ImageCacheEntryMetadata& rhs) const;
 
-  // Whether the resource is drawn in an incognito window.  This is only set to
-  // true when Material Design is enabled, since before MD tabs in normal and
-  // incognito windows look the same.
-  bool incognito;
-
-  int resource_id;
+  int resource_id;     // Only needed by pre-MD
+  SkColor fill_color;  // Both colors only needed by MD
+  SkColor stroke_color;
   ui::ScaleFactor scale_factor;
   gfx::Size size;
 };
 
 Tab::ImageCacheEntryMetadata::ImageCacheEntryMetadata(
-    bool incognito,
     int resource_id,
+    SkColor fill_color,
+    SkColor stroke_color,
     ui::ScaleFactor scale_factor,
     const gfx::Size& size)
-    : incognito(incognito),
-      resource_id(resource_id),
+    : resource_id(resource_id),
+      fill_color(fill_color),
+      stroke_color(stroke_color),
       scale_factor(scale_factor),
       size(size) {
   DCHECK_NE(ui::SCALE_FACTOR_NONE, scale_factor);
+
+  // Some fields are only relevant for pre-MD vs. MD.  Erase the irrelevant ones
+  // so they don't cause incorrect cache misses.
+  // TODO(pkasting): Remove |resource_id| field when non-MD code is deleted.
+  if (ui::MaterialDesignController::IsModeMaterial())
+    resource_id = 0;
+  else
+    fill_color = stroke_color = SK_ColorTRANSPARENT;
 }
 
 Tab::ImageCacheEntryMetadata::~ImageCacheEntryMetadata() {}
 
 bool Tab::ImageCacheEntryMetadata::operator==(
     const ImageCacheEntryMetadata& rhs) const {
-  return incognito == rhs.incognito && resource_id == rhs.resource_id &&
-      scale_factor == rhs.scale_factor && size == rhs.size;
+  return resource_id == rhs.resource_id && fill_color == rhs.fill_color &&
+      stroke_color == rhs.stroke_color && scale_factor == rhs.scale_factor &&
+      size == rhs.size;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Tab::ImageCacheEntry
 
 struct Tab::ImageCacheEntry {
   ImageCacheEntry(const ImageCacheEntryMetadata& metadata,
                   const gfx::ImageSkia& image);
   ~ImageCacheEntry();
 
@@ skipping 851 matching lines @@
 
 void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
   bool has_custom_image;
   int fill_id = controller_->GetBackgroundResourceId(&has_custom_image);
 
   // If the theme is providing a custom background image, then its top edge
   // should be at the top of the tab. Otherwise, we assume that the background
   // image is a composited foreground + frame image.  Note that if the theme is
   // only providing a custom frame image, |has_custom_image| will be true, but
   // we should use the |background_offset_| here.
-  const int y_offset = GetThemeProvider()->HasCustomImage(fill_id) ?
+  const ui::ThemeProvider* tp = GetThemeProvider();
+  const int y_offset = tp->HasCustomImage(fill_id) ?
       -GetLayoutConstant(TAB_TOP_EXCLUSION_HEIGHT) : background_offset_.y();
 
   // We only cache the image when it's the default image and we're not hovered,
   // to avoid caching a background image that isn't the same for all tabs.
   if (has_custom_image || hover_controller_.ShouldDraw()) {
     PaintTabBackgroundUsingFillId(canvas, false, fill_id, has_custom_image,
                                   y_offset);
     return;
   }
 
   const ImageCacheEntryMetadata metadata(
-      ui::MaterialDesignController::IsModeMaterial() &&
-          controller_->IsIncognito(),
-      fill_id, ui::GetSupportedScaleFactor(canvas->image_scale()), size());
+      fill_id, tp->GetColor(ThemeProperties::COLOR_BACKGROUND_TAB),
+      controller_->GetToolbarTopSeparatorColor(),
+      ui::GetSupportedScaleFactor(canvas->image_scale()), size());
   auto it = std::find_if(
       image_cache_->begin(), image_cache_->end(),
       [&metadata](const ImageCacheEntry& e) { return e.metadata == metadata; });
   if (it == image_cache_->end()) {
     gfx::Canvas tmp_canvas(size(), canvas->image_scale(), false);
     PaintTabBackgroundUsingFillId(&tmp_canvas, false, fill_id, false, y_offset);
     image_cache_->emplace_front(metadata,
                                 gfx::ImageSkia(tmp_canvas.ExtractImageRep()));
     if (image_cache_->size() > kMaxImageCacheSize)
       image_cache_->pop_back();
@@ skipping 414 matching lines @@
   inactive_images_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);
   inactive_images_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);
   inactive_images_.l_width = inactive_images_.image_l->width();
   inactive_images_.r_width = inactive_images_.image_r->width();
 
   mask_images_.image_l = rb.GetImageSkiaNamed(IDR_TAB_ALPHA_LEFT);
   mask_images_.image_r = rb.GetImageSkiaNamed(IDR_TAB_ALPHA_RIGHT);
   mask_images_.l_width = mask_images_.image_l->width();
   mask_images_.r_width = mask_images_.image_r->width();
 }