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 1791dd3084914071c1fa6e15ac664b44c31d006a..8cba6dd96f3d833194ce4b40aa34eab3a9ce92cf 100644
--- a/chrome/browser/android/compositor/layer/tab_layer.cc
+++ b/chrome/browser/android/compositor/layer/tab_layer.cc
@@ -134,6 +134,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,
@@ -153,8 +154,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);
@@ -165,8 +167,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;
@@ -478,12 +481,6 @@ void TabLayer::SetProperties(int id,
     front_border_->SetBounds(border_size);
     front_border_->SetOpacity(border_alpha);
     front_border_->SetNearestNeighbor(toolbar_visible);
-
-    if (toolbar_background_color != toolbar_background_color_) {
-      toolbar_background_color_ = toolbar_background_color;
-      front_border_->SetFilters(
-          *createSolidColorFilter(toolbar_background_color).get());
-    }
   }
 
   front_border_inner_shadow_->SetHideLayerAndSubtree(
@@ -522,13 +519,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.
@@ -628,20 +618,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));

[aelias_OOO_until_Jul13, 2016/08/31 17:12:26]

I happened to notice this on my queue, I can review CC changes.

I think this patch is taking the wrong approach because it's doing a
memory/performance tradeoff and also adding memory management complexity,
whereas I see no reason why the tint can't be made cheaper without any memory
cost at all.  The full-power ColorMatrix FilterOperation seems slow, but as this
is a very simple type of filter, this perf problem should be solvable with a
more targeted filter.

I think SkFilter::MakeModeFilter(color, SkXfermode::kModulate_Mode) should be
equivalent to the matrix above.  I try changing CC to check the matrix for this
near-identity pattern in RenderSurfaceFilters::BuildImageFilter and special-case
it to create such an XferMode filter.  If that doesn't seem to improve the
performance, me and ajuma@ can give look more closely and give more advice.

[mdjones, 2016/08/31 17:41:00]

I chatted with enne and ajuma before implementing this patch. Being the simplest
filter, the color filter already takes a handful shortcuts through the code.
From my understanding, the major expense is creating render surfaces for filter
to be drawn to.

[aelias_OOO_until_Jul13, 2016/08/31 18:01:32]

OK, did you take a trace to prove that?  If so could you post it on the bug? 
Also, do you have an estimate for how much memory this tint cache winds up
taking in practice?  (I realize the close button and border seem pretty small
but this stuff sometimes adds up especially when you generate 30 copies.)

Secondly the buganizer says "But why is the frame rate of the animation
dependent on number of tabs open?"  Do you understand this part of the problem? 
My intuition is that this tint problem is a fixed cost that still leaves us
within 60fps, but there's a per-invisible-tab-cost (JNI? something else?) that
puts us over the top.  And because there's no limit to the number of invisible
tabs, we need to address that to really get reliable no-jank.  I've noticed
myself when I have ~200 tabs, tab switcher framerate is very low, and I was
meaning to look into it.

I saw the bug is marked P1 and I gather that's because of http://b/30862870 . 
So I appreciate you need to get this finished soon and am willing to help you
out.  Even still I'd like us to be careful before adding yet more memory
management to the tab switcher.  It's constantly a source of memory spikes and
bugginess and it's one of the things sievers@ and I would like to simplify
rather than make more complex.

-  return filters;
-}
-
 scoped_refptr<cc::Layer> TabLayer::layer() {
   return layer_;
 }
@@ -651,8 +627,6 @@ TabLayer::TabLayer(bool incognito,
                    LayerTitleCache* layer_title_cache,
                    TabContentManager* tab_content_manager)
     : incognito_(incognito),
-      toolbar_background_color_(0),
-      close_button_color_(0),
       resource_manager_(resource_manager),
       layer_title_cache_(layer_title_cache),
       layer_(cc::Layer::Create()),