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

base/android/jni_array.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/jni_array.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 
@@ skipping 211 matching lines @@
     jobjectArray array,
     std::vector<std::string>* out) {
   DCHECK(out);
   size_t len = SafeGetArrayLength(env, array);
   out->resize(len);
   for (size_t i = 0; i < len; ++i) {
     ScopedJavaLocalRef<jbyteArray> bytes_array(
         env, static_cast<jbyteArray>(
             env->GetObjectArrayElement(array, i)));
     jsize bytes_len = env->GetArrayLength(bytes_array.obj());
     jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), NULL);

[rmcilroy, 2015/10/28 11:22:11]

nit - please make this nullptr too

[Theresa, 2015/10/28 22:20:58]

Done.

     (*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)));
+    jsize array_len = env->GetArrayLength(int_array.obj());
+    jint* ints = env->GetIntArrayElements(int_array.obj(), nullptr);
+    std::vector<int> vector_ints = out->at(i);
+    vector_ints.resize(array_len);

[rmcilroy, 2015/10/28 11:22:11]

Is there a reason you can't use assign here, i.e:
(*out)[i].assign(reinterpret_cast<const int*>(ints), array_len);

?

[Theresa, 2015/10/28 22:20:58]

I get a reinterpret cast error:
../../base/android/jni_array.cc:251:67: error: invalid conversion from 'const
int*' to 'std::__1::vector<int>::size_type {aka unsigned int}' [-fpermissive]
     (*out)[i].assign(reinterpret_cast<const int*>(ints), array_len);

I simplified this method to call JavaIntArrayToIntVector instead.

+    for (jsize j = 0; j < array_len; ++j) {
+      vector_ints[j] = static_cast<int>(ints[j]);
+    }
+
+    (*out)[i] = vector_ints;
+    env->ReleaseIntArrayElements(int_array.obj(), ints, JNI_ABORT);
+  }
+}
+
 }  // namespace android
 }  // namespace base