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

base/android/jni_array.cc

Index: base/android/jni_array.cc
diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc
index bc922f883c2f8c296fbbfdd4a2590afc2fb11bc9..0b7ce5d1448e35e8060f94eb441926b4d223a06e 100644
--- a/base/android/jni_array.cc
+++ b/base/android/jni_array.cc
@@ -229,11 +229,27 @@ void JavaArrayOfByteArrayToStringVector(
         env, static_cast<jbyteArray>(
             env->GetObjectArrayElement(array, i)));
     jsize bytes_len = env->GetArrayLength(bytes_array.obj());
-    jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), NULL);
+    jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), nullptr);
     (*out)[i].assign(reinterpret_cast<const char*>(bytes), bytes_len);
     env->ReleaseByteArrayElements(bytes_array.obj(), bytes, JNI_ABORT);
   }
 }
 
+void JavaArrayOfIntArrayToIntVector(
+    JNIEnv* env,
+    jobjectArray array,
+    std::vector<std::vector<int>>* out) {
+  DCHECK(out);
+  size_t len = SafeGetArrayLength(env, array);
+  out->resize(len);
+  for (size_t i = 0; i < len; ++i) {
+    ScopedJavaLocalRef<jintArray> int_array(
+        env, static_cast<jintArray>(env->GetObjectArrayElement(array, i)));
+    jint* ints = env->GetIntArrayElements(int_array.obj(), nullptr);

[Dmitry Skiba, 2015/10/30 16:46:19]

Hmm, do we really need to get 'ints' here? It doesn't seem to be used.

[Theresa, 2015/10/30 17:01:15]

It's used to release the int array elements on line 250.

[Dmitry Skiba, 2015/10/30 17:17:32]

Yes, but 'ints' is not read from. For example in the function above,
JavaArrayOfByteArrayToStringVector(), 'bytes' variable (similar to our 'ints')
is used to initialize 'out[i]'. In our case JavaIntArrayToIntVector() retrieves
elements by itself, without using 'ints'.

[Theresa, 2015/10/30 17:25:28]

I included this code because a new jintArray is created on line 246. As I
understand it, calling ReleaseIntArrayElements on the jint* derived from that
jintArray indicates that the native code no longer needs access to those
elements. If that's not necessary, I can remove these lines in a new CL.

[Dmitry Skiba, 2015/10/30 17:37:26]

There are two ways of accessing array elements: GetIntArrayRegion() which just
copies range into pre-allocated buffer and GetIntArrayElements /
GetPrimitiveArrayCritical which can sometimes return internal representation of
the array (pin the array), but are also allowed to return a copy of array's
elements (hence isCopy argument which is nullptr in our case). Since we already
using GetIntArrayRegion(), we don't really need GetIntArrayElements /
ReleaseIntArrayElements. And I believe GetIntArrayRegion() is more efficient in
our case as it avoids possible intermediate copy.

+    JavaIntArrayToIntVector(env, int_array.obj(), &((*out)[i]));
+    env->ReleaseIntArrayElements(int_array.obj(), ints, JNI_ABORT);
+  }
+}
+
 }  // namespace android
 }  // namespace base