Add tinted static UI resource cache

ui/android/resources/resource_manager_impl.cc

Index: ui/android/resources/resource_manager_impl.cc
diff --git a/ui/android/resources/resource_manager_impl.cc b/ui/android/resources/resource_manager_impl.cc
index 61c7bdad554d3f7999494da3fad752f8e48e2726..b97fb19251bbd0b169d4b3b373325a68624e9654 100644
--- a/ui/android/resources/resource_manager_impl.cc
+++ b/ui/android/resources/resource_manager_impl.cc
@@ -11,9 +11,13 @@
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "jni/ResourceManager_jni.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
 #include "ui/android/resources/ui_resource_provider.h"
 #include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
@@ -73,6 +77,77 @@ ResourceManager::Resource* ResourceManagerImpl::GetResource(
   return resource;
 }
 
+void ResourceManagerImpl::RemoveUnusedTints(
+    const std::unordered_set<int>& used_tints) {
+  // Iterate over the currently cached tints and remove ones that were not
+  // used as defined in |used_tints|.
+  for (auto it = tinted_resources_.cbegin(); it != tinted_resources_.cend();) {
+    if (used_tints.find(it->first) == used_tints.end()) {
+        it = tinted_resources_.erase(it);
+    } else {
+        ++it;
+    }
+  }
+}
+
+ResourceManager::Resource* ResourceManagerImpl::GetStaticResourceWithTint(
+    int res_id,
+    int tint_color) {
+  if (tinted_resources_.find(tint_color) == tinted_resources_.end()) {
+    tinted_resources_[tint_color] = base::MakeUnique<ResourceMap>();
+  }
+  ResourceMap* resource_map = tinted_resources_[tint_color].get();
+
+  Resource* tinted_resource = resource_map->Lookup(res_id);
+
+  // If the resource is already cached, use it.
+  if (tinted_resource)
+    return tinted_resource;
+
+  tinted_resource = new Resource();
+
+  ResourceManager::Resource* base_image =
+      GetResource(ANDROID_RESOURCE_TYPE_STATIC, res_id);
+  DCHECK(base_image);
+
+  TRACE_EVENT0("browser", "ResourceManagerImpl::GetStaticResourceWithTint");
+  SkBitmap tinted_bitmap;
+  tinted_bitmap.allocPixels(SkImageInfo::MakeN32Premul(base_image->size.width(),
+      base_image->size.height()));
+
+  SkCanvas canvas(tinted_bitmap);
+  canvas.clear(SK_ColorTRANSPARENT);
+
+  // Build a color filter to use on the base resource. This filter multiplies
+  // the RGB components by the components of the new color but retains the
+  // alpha of the original image.
+  SkPaint color_filter;
+  color_filter.setColorFilter(
+      SkColorFilter::MakeModeFilter(tint_color, SkXfermode::kModulate_Mode));
+
+  // Draw the resource and make it immutable.
+  base_image->ui_resource->GetBitmap(base_image->ui_resource->id(), false)
+      .DrawToCanvas(&canvas, &color_filter);
+  tinted_bitmap.setImmutable();
+
+  // Create a UI resource from the new bitmap.
+  tinted_resource = new Resource();
+  tinted_resource->size = gfx::Size(base_image->size);
+  tinted_resource->padding = gfx::Rect(base_image->padding);
+  tinted_resource->aperture = gfx::Rect(base_image->aperture);
+  tinted_resource->ui_resource = cc::ScopedUIResource::Create(host_,
+      cc::UIResourceBitmap(tinted_bitmap));
+
+  resource_map->AddWithID(tinted_resource, res_id);
+
+  return tinted_resource;
+}
+
+void ResourceManagerImpl::ClearTintedResourceCache(JNIEnv* env,
+    const JavaRef<jobject>& jobj) {
+  tinted_resources_.clear();
+}
+
 void ResourceManagerImpl::PreloadResource(AndroidResourceType res_type,
                                           int res_id) {
   DCHECK_GE(res_type, ANDROID_RESOURCE_TYPE_FIRST);
@@ -104,6 +179,7 @@ void ResourceManagerImpl::OnResourceReady(JNIEnv* env,
                "resource_type", res_type,
                "resource_id", res_id);
 
+

[aelias_OOO_until_Jul13, 2016/09/08 22:04:41]

nit: unnecessary newline

[mdjones, 2016/09/09 01:19:15]

Done.

   Resource* resource = resources_[res_type].Lookup(res_id);
   if (!resource) {
     resource = new Resource();