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

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

Index: chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
index 8b885b970f1dcf9065b9fe83d5aa5601f494ff57..ed51e59d81fac76280fb4b8bfeae3acf1e81bfb5 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h"
 
 #include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
 #include "chrome/browser/android/compositor/layer/contextual_search_layer.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/ContextualSearchSceneLayer_jni.h"
@@ -28,7 +29,6 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jint search_context_resource_id,
     jint search_term_resource_id,
     jint search_bar_shadow_resource_id,
-    jint search_provider_icon_resource_id,
     jint arrow_up_resource_id,
     jint close_icon_resource_id,
     jint progress_bar_background_resource_id,
@@ -51,6 +51,12 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jfloat search_bar_border_height,
     jboolean search_bar_shadow_visible,
     jfloat search_bar_shadow_opacity,
+    jboolean search_provider_icon_sprite_visible,
+    jfloat search_provider_icon_sprite_size,
+    jfloat search_provider_icon_sprite_scale,
+    jobject search_provider_icon_sprite_bitmap,
+    jintArray search_provider_icon_sprite_rects,
+    jboolean search_provider_icon_sprite_paint_previous_frames,
     jfloat arrow_icon_opacity,
     jfloat arrow_icon_rotation,
     jfloat close_icon_opacity,
@@ -79,12 +85,20 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
                           : content::ContentViewCore::GetNativeContentViewCore(
                                 env, jcontent_view_core);
 
+  std::vector<int> search_provider_icon_sprite_rects_array;
+  base::android::JavaIntArrayToIntVector(
+      env, search_provider_icon_sprite_rects,
+      &search_provider_icon_sprite_rects_array);
+
+  SkBitmap search_provider_icon_sprite_skbitmap =
+      gfx::CreateSkBitmapFromJavaBitmap(
+          gfx::JavaBitmap(search_provider_icon_sprite_bitmap));
+
   contextual_search_layer_->SetProperties(
       search_bar_background_resource_id,
       search_context_resource_id,
       search_term_resource_id,
       search_bar_shadow_resource_id,
-      search_provider_icon_resource_id,
       arrow_up_resource_id,
       close_icon_resource_id,
       progress_bar_background_resource_id,
@@ -107,6 +121,12 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
       search_bar_border_height,
       search_bar_shadow_visible,
       search_bar_shadow_opacity,
+      search_provider_icon_sprite_visible,
+      search_provider_icon_sprite_size,
+      search_provider_icon_sprite_scale,
+      search_provider_icon_sprite_skbitmap,
+      search_provider_icon_sprite_rects_array,
+      search_provider_icon_sprite_paint_previous_frames,
       arrow_icon_opacity,
       arrow_icon_rotation,
       close_icon_opacity,