Add tinted static UI resource cache

chrome/browser/android/compositor/layer/tab_layer.cc

Index: chrome/browser/android/compositor/layer/tab_layer.cc
diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc
index 74f58562b4d350b13b236305cd5e82d0d4f3c9a0..f436255e2fc96bbba5d616f66b5daebdf82f67f1 100644
--- a/chrome/browser/android/compositor/layer/tab_layer.cc
+++ b/chrome/browser/android/compositor/layer/tab_layer.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/android/compositor/layer/tab_layer.h"
 
-#include "base/base_switches.h"
-#include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
@@ -137,6 +135,7 @@ void TabLayer::SetProperties(int id,
                              bool show_toolbar,
                              int default_theme_color,
                              int toolbar_background_color,
+                             int default_close_button_color,
                              int close_button_color,
                              bool anonymize_toolbar,
                              int toolbar_textbox_resource_id,
@@ -156,8 +155,9 @@ void TabLayer::SetProperties(int id,
 
   // Grab required resources
   ui::ResourceManager::Resource* border_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                     border_resource_id);
+      resource_manager_->GetStaticResourceWithTint(border_resource_id,
+                                                   toolbar_background_color,
+                                                   default_theme_color);
   ui::ResourceManager::Resource* border_inner_shadow_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                      border_inner_shadow_resource_id);
@@ -168,8 +168,9 @@ void TabLayer::SetProperties(int id,
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                      contour_resource_id);
   ui::ResourceManager::Resource* close_btn_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                     close_button_resource_id);
+      resource_manager_->GetStaticResourceWithTint(close_button_resource_id,
+                                                   close_button_color,
+                                                   default_close_button_color);
   ui::ResourceManager::Resource* back_logo_resource = nullptr;
 
   DecorationTitle* title_layer = nullptr;
@@ -481,19 +482,6 @@ void TabLayer::SetProperties(int id,
     front_border_->SetBounds(border_size);
     front_border_->SetOpacity(border_alpha);
     front_border_->SetNearestNeighbor(toolbar_visible);
-
-    int tab_switcher_color = default_theme_color;
-
-    // Colorize the tab decoration if enabled.
-    if (tab_switcher_themes_enabled_) {
-        tab_switcher_color = toolbar_background_color;
-    }
-
-    if (toolbar_background_color != toolbar_background_color_) {
-      toolbar_background_color_ = toolbar_background_color;
-      front_border_->SetFilters(
-          *createSolidColorFilter(tab_switcher_color).get());
-    }
   }
 
   front_border_inner_shadow_->SetHideLayerAndSubtree(
@@ -532,13 +520,6 @@ void TabLayer::SetProperties(int id,
 
   close_button_->SetHideLayerAndSubtree(!close_btn_visible);
   if (close_btn_visible) {
-
-    if (close_button_color != close_button_color_) {
-      close_button_color_ = close_button_color;
-      close_button_->SetFilters(
-          *createSolidColorFilter(close_button_color).get());
-    }
-
     close_button_->SetPosition(close_button_position);
     close_button_->SetBounds(close_button_size);
     // Non-linear alpha looks better.
@@ -638,20 +619,6 @@ void TabLayer::SetProperties(int id,
   }
 }
 
-std::unique_ptr<cc::FilterOperations> TabLayer::createSolidColorFilter(
-    int color) {
-  std::unique_ptr<cc::FilterOperations> filters =
-      base::WrapUnique(new cc::FilterOperations());
-  SkScalar colorMatrix[] = {
-      SkColorGetR(color) / 255.0f, 0, 0, 0, 0,
-      0, SkColorGetG(color) / 255.0f, 0, 0, 0,
-      0, 0, SkColorGetB(color) / 255.0f, 0, 0,
-      0, 0, 0, 1, 0,
-  };
-  filters->Append(cc::FilterOperation::CreateColorMatrixFilter(colorMatrix));
-  return filters;
-}
-
 scoped_refptr<cc::Layer> TabLayer::layer() {
   return layer_;
 }
@@ -661,9 +628,6 @@ TabLayer::TabLayer(bool incognito,
                    LayerTitleCache* layer_title_cache,
                    TabContentManager* tab_content_manager)
     : incognito_(incognito),
-      toolbar_background_color_(0),
-      close_button_color_(0),
-      tab_switcher_themes_enabled_(false),
       resource_manager_(resource_manager),
       layer_title_cache_(layer_title_cache),
       layer_(cc::Layer::Create()),
@@ -701,10 +665,6 @@ TabLayer::TabLayer(bool incognito,
   back_logo_->SetIsDrawable(true);
 
   front_border_->SetFillCenter(false);
-
-  tab_switcher_themes_enabled_ =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableTabSwitcherThemeColors);
 }
 
 TabLayer::~TabLayer() {