Android::Pass Bitmap.Config instead of bool to CreateJavaBitmap

ui/gfx/android/java_bitmap.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 "ui/gfx/android/java_bitmap.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 JavaBitmap::~JavaBitmap() {
   int err = AndroidBitmap_unlockPixels(AttachCurrentThread(), bitmap_);
   DCHECK(!err);
 }
 
 // static
 bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-static ScopedJavaLocalRef<jobject> CreateJavaBitmap(int width, int height,
-                                                    bool is565_config) {
-  return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
-      width, height, is565_config);
+static ScopedJavaLocalRef<jobject> CreateJavaBitmap(int width,
+                                                    int height,
+                                                    jobject bitmap_config) {

[bulach, 2014/02/28 13:19:25]

ditto, just pass the int through instead of the jobject

[sivag, 2014/03/04 12:36:04]

Done.

+
+  return Java_BitmapHelper_createBitmap(
+      AttachCurrentThread(), width, height, bitmap_config);
 }
 
 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
   DCHECK(skbitmap);
   SkBitmap::Config config = skbitmap->getConfig();
   DCHECK((config == SkBitmap::kRGB_565_Config) ||
          (config == SkBitmap::kARGB_8888_Config));
   // If the Config is not RGB565 it is default i.e ARGB8888
-  ScopedJavaLocalRef<jobject> jbitmap =
-      CreateJavaBitmap(skbitmap->width(), skbitmap->height(),
-                       (config == SkBitmap::kRGB_565_Config));
+  ScopedJavaLocalRef<jobject> java_bitmap_config =
+      ConvertToJavaBitmapConfig(config);
+  ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap(
+      skbitmap->width(), skbitmap->height(), java_bitmap_config.obj());
   SkAutoLockPixels src_lock(*skbitmap);
   JavaBitmap dst_lock(jbitmap.obj());
   void* src_pixels = skbitmap->getPixels();
   void* dst_pixels = dst_lock.pixels();
   memcpy(dst_pixels, src_pixels, skbitmap->getSize());
 
   return jbitmap;
 }
 
 SkBitmap CreateSkBitmapFromJavaBitmap(JavaBitmap& jbitmap) {
@@ skipping 26 matching lines @@
   if (jobj.is_null())
     return SkBitmap();
 
   JavaBitmap jbitmap(jobj.obj());
   SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(jbitmap);
   return skia::ImageOperations::Resize(
       bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height());
 }
 
 SkBitmap::Config ConvertToSkiaConfig(jobject bitmap_config) {
-  int jbitmap_config =
-      Java_BitmapHelper_bitmapConfig(AttachCurrentThread(), bitmap_config);
+  int jbitmap_config = Java_BitmapHelper_getConfigEnumValue(
+      AttachCurrentThread(), bitmap_config);
   switch (jbitmap_config) {
     case BITMAP_FORMAT_ALPHA_8:
       return SkBitmap::kA8_Config;
     case BITMAP_FORMAT_ARGB_4444:
       return SkBitmap::kARGB_4444_Config;
     case BITMAP_FORMAT_ARGB_8888:
       return SkBitmap::kARGB_8888_Config;
     case BITMAP_FORMAT_RGB_565:
       return SkBitmap::kRGB_565_Config;
     case BITMAP_FORMAT_NO_CONFIG:
     default:
       return SkBitmap::kNo_Config;
   }
 }
 
+ScopedJavaLocalRef<jobject> ConvertToJavaBitmapConfig(

[bulach, 2014/02/28 13:19:25]

nit: perhaps SkBitmapConfigToBitmapFormat ?
...make it return an int and remove the JNI call..

[jdduke (slow), 2014/02/28 14:20:59]

+1 to passing an int and removing the additional JNI calls.

[sivag, 2014/03/04 12:36:04]

Done.

[sivag, 2014/03/04 12:36:04]

Done.

+    SkBitmap::Config bitmap_config) {
+  int matching_enum_config = BITMAP_FORMAT_NO_CONFIG;
+  switch (bitmap_config) {
+    case SkBitmap::kA8_Config:
+      matching_enum_config = BITMAP_FORMAT_ALPHA_8;
+      break;
+    case SkBitmap::kARGB_4444_Config:
+      matching_enum_config = BITMAP_FORMAT_ARGB_4444;
+      break;
+    case SkBitmap::kARGB_8888_Config:
+      matching_enum_config = BITMAP_FORMAT_ARGB_8888;
+      break;
+    case SkBitmap::kRGB_565_Config:
+      matching_enum_config = BITMAP_FORMAT_RGB_565;
+      break;
+    case SkBitmap::kNo_Config:
+    default:
+      matching_enum_config = BITMAP_FORMAT_NO_CONFIG;
+      break;
+  }
+  DCHECK(matching_enum_config == BITMAP_FORMAT_NO_CONFIG);
+  return Java_BitmapHelper_getJavabitmapConfig(AttachCurrentThread(),
+                                               matching_enum_config);
+}
+
 }  //  namespace gfx