Add tinted static UI resource cache

ui/android/resources/resource_manager_impl.h

Index: ui/android/resources/resource_manager_impl.h
diff --git a/ui/android/resources/resource_manager_impl.h b/ui/android/resources/resource_manager_impl.h
index 4e089898f3a67ec0bc73017ed03e7d4833d5c5fb..23849ceba772c4aa9d1ae3f0275b0d8b3be6e8d9 100644
--- a/ui/android/resources/resource_manager_impl.h
+++ b/ui/android/resources/resource_manager_impl.h
@@ -26,6 +26,9 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
   // ResourceManager implementation.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   Resource* GetResource(AndroidResourceType res_type, int res_id) override;
+  Resource* GetStaticResourceWithTint(
+      int res_id, int tint_color) override;
+  void RemoveUnusedTints(const std::unordered_set<int>& used_tints) override;
   void PreloadResource(AndroidResourceType res_type, int res_id) override;
   CrushedSpriteResource* GetCrushedSpriteResource(
       int bitmap_res_id, int metadata_res_id) override;
@@ -60,6 +63,8 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
       const base::android::JavaRef<jobject>& jobj,
       jint bitmap_res_id,
       const base::android::JavaRef<jobject>& bitmap);
+  void ClearTintedResourceCache(JNIEnv* env,
+      const base::android::JavaRef<jobject>& jobj);
 
   static bool RegisterResourceManager(JNIEnv* env);
 
@@ -82,10 +87,12 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
   typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
   typedef IDMap<CrushedSpriteResource, IDMapOwnPointer>
       CrushedSpriteResourceMap;
+  typedef std::unordered_map<int, ResourceMap*> TintedResourceMap;

[aelias_OOO_until_Jul13, 2016/09/07 19:34:44]

We should never be holding lifetime-managing raw ptrs in STL containers.  Today,
compiler support has improved enough that we can put scoped_ptr<ResourceMap>
inside STL containers, so I'd encourage that.

It looks like IDMap<T, IDMapOwnPointer> is a 2008-era base/ class with
effectively the same behavior as std::unordered_map<int, scoped_ptr<T>> that
encourages the use of raw pointers and has weirdo non-STL-style methods.  Looks
to me like IDMap should be deprecated.  Could you drive-by change the two other
uses of IDMap in this class to std::unordered_map<int, scoped_ptr<T>>?

[mdjones, 2016/09/08 16:34:44]

I updated the TintedResourceMap to hold a unique_ptr but I'd really like to
remove IDMap in a separate CL (later today). If you think it really needs to be
in this change I can add it.

 
   cc::LayerTreeHost* host_;
   ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];
   CrushedSpriteResourceMap crushed_sprite_resources_;
+  TintedResourceMap tinted_resources_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;