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

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
index c071d90d6ed9c6df8d3fc065905cf6f9c60f8048..19f918885f552ef08001c6b839155d46e291f0f4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.compositor.scene_layer;
 
+import android.graphics.Bitmap;
+
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
@@ -60,6 +62,14 @@ public class ContextualSearchSceneLayer extends SceneLayer {
         boolean searchBarShadowVisible = mSearchPanel.getSearchBarShadowVisible();
         float searchBarShadowOpacity = mSearchPanel.getSearchBarShadowOpacity();
 
+        boolean searchProviderIconSpriteVisible = mSearchPanel.isSearchProviderIconSpriteVisible();
+        float searchProviderIconSpriteSize = mSearchPanel.getSearchProviderIconSpriteSize();
+        float searchProviderIconSpriteScale = mSearchPanel.getSearchProviderIconSpriteScale();
+        Bitmap searchProviderIconSpriteBitmap = mSearchPanel.getSearchProviderIconSpriteBitmap();
+        int[] searchProviderIconSpriteRects = mSearchPanel.getSearchProviderIconSpriteFrameRects();
+        boolean searchProviderIconSpritePaintPreviousFrames =
+                mSearchPanel.shouldPaintPreviousSearchProviderIconSpriteFrames();
+
         float arrowIconOpacity = mSearchPanel.getArrowIconOpacity();
         float arrowIconRotation = mSearchPanel.getArrowIconRotation();
 
@@ -76,7 +86,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 searchContextViewId,
                 searchTermViewId,
                 R.drawable.contextual_search_bar_shadow,
-                R.drawable.google_icon,
                 R.drawable.breadcrumb_arrow,
                 ContextualSearchPanel.CLOSE_ICON_DRAWABLE_ID,
                 R.drawable.progress_bar_background,
@@ -99,6 +108,12 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 searchBarBorderHeight * mDpToPx,
                 searchBarShadowVisible,
                 searchBarShadowOpacity,
+                searchProviderIconSpriteVisible,
+                searchProviderIconSpriteSize,
+                searchProviderIconSpriteScale,
+                searchProviderIconSpriteBitmap,

[pedro (no code reviews), 2015/10/01 23:16:23]

Passing a Bitmap here doesn't sound right, specially because we will call this
on every frame. Please confirm with dtrainor@ if he's okay with this approach.

I think using the Resource Loader system would be much better, although this
might require tweaking the loader to use a custom resolution.
https://code.google.com/p/chromium/codesearch#chromium/src/ui/android/java/sr...

Another option would be passing the Bitmap only once, but using Resource Loader
would be preferable.

+                searchProviderIconSpriteRects,
+                searchProviderIconSpritePaintPreviousFrames,
                 arrowIconOpacity,
                 arrowIconRotation,
                 closeIconOpacity,
@@ -134,7 +149,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             int searchContextResourceId,
             int searchTermResourceId,
             int searchBarShadowResourceId,
-            int searchProviderIconResourceId,
             int arrowUpResourceId,
             int closeIconResourceId,
             int progressBarBackgroundResourceId,
@@ -157,6 +171,12 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             float searchBarBorderHeight,
             boolean searchBarShadowVisible,
             float searchBarShadowOpacity,
+            boolean searchProviderIconSpriteVisible,
+            float searchProviderIconSpriteSize,
+            float searchProviderIconSpriteScale,
+            Bitmap searchProviderIconSpriteBitmap,
+            int[] searchProviderIconSpriteRects,
+            boolean searchProviderIconSpritePaintPreviousFrames,
             float arrowIconOpacity,
             float arrowIconRotation,
             float closeIconOpacity,