[Contextual Search] Add support for crushed sprites and animate the search provider icon

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 6e74ca58e45af8365ae641bc5aff853c0f85ec5c..f11c5aa0b5c020abf9cc4339bdd41fe1cfed23e4 100644
--- a/ui/android/resources/resource_manager_impl.h
+++ b/ui/android/resources/resource_manager_impl.h
@@ -25,6 +25,9 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   Resource* GetResource(AndroidResourceType res_type, int res_id) override;
   void PreloadResource(AndroidResourceType res_type, int res_id) override;
+  scoped_refptr<CrushedSpriteResource> GetCrushedSpriteResource(
+      int bitmap_res_id, int metadata_res_id) override;
+  void ReloadCrushedSpriteResource(int bitmap_res_id) override;
 
   // Called from Java
   // ----------------------------------------------------------
@@ -41,22 +44,46 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
                        jint aperture_top,
                        jint aperture_right,
                        jint aperture_bottom);
+  void OnCrushedSpriteResourceReady(JNIEnv* env,
+                                    jobject jobj,
+                                    jint bitmap_res_id,
+                                    jobject bitmap,
+                                    jobjectArray frame_rects,
+                                    jint sprite_size);
+  void OnCrushedSpriteResourceReloaded(JNIEnv* env,
+                                       jobject jobj,
+                                       jint bitmap_res_id,
+                                       jobject bitmap);
 
   static bool RegisterResourceManager(JNIEnv* env);
 
  private:
   friend class TestResourceManagerImpl;
 
+  struct CrushedSpriteResourceHolder {

[David Trainor- moved to gerrit, 2015/10/15 21:04:58]

Hopefully we don't need this if we don't hold onto a strong reference to the
resource in CrushedSpriteLayer.

[Theresa, 2015/10/24 00:06:46]

That's correct. I only created the struct because the IDMap doesn't work with
scoped_refptr's.

+   public:
+    CrushedSpriteResourceHolder();
+    ~CrushedSpriteResourceHolder();
+
+    scoped_refptr<CrushedSpriteResource> resource;
+  };
+
   // Start loading the resource. virtual for testing.
   virtual void PreloadResourceFromJava(AndroidResourceType res_type,
                                        int res_id);
   virtual void RequestResourceFromJava(AndroidResourceType res_type,
                                        int res_id);
+  virtual void RequestCrushedSpriteResourceFromJava(int bitmap_res_id,
+                                                    int metadata_res_id);
+  virtual void ReloadCrushedSpriteResourceFromJava(int bitmap_res_id);
 
   typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
+  typedef IDMap<CrushedSpriteResourceHolder, IDMapOwnPointer>
+      CrushedSpriteResourceMap;
 
   cc::LayerTreeHost* host_;
   ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];
+  CrushedSpriteResourceMap crushed_sprite_resources_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;