[Android] Modify CreateJavaBitmap to accept SkBitmap::Config and export the API.

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,
-                                                    int bitmap_config) {
-
-  return Java_BitmapHelper_createBitmap(
-      AttachCurrentThread(), width, height, bitmap_config);
-}
-
 static int SkBitmapConfigToBitmapFormat(SkBitmap::Config bitmap_config) {
   switch (bitmap_config) {
     case SkBitmap::kA8_Config:
       return BITMAP_FORMAT_ALPHA_8;
     case SkBitmap::kARGB_4444_Config:
       return BITMAP_FORMAT_ARGB_4444;
     case SkBitmap::kARGB_8888_Config:
       return BITMAP_FORMAT_ARGB_8888;
     case SkBitmap::kRGB_565_Config:
       return BITMAP_FORMAT_RGB_565;
     case SkBitmap::kNo_Config:
     default:
       NOTREACHED();
       return BITMAP_FORMAT_NO_CONFIG;
   }
 }
 
+ScopedJavaLocalRef<jobject> CreateJavaBitmap(int width,
+                                             int height,
+                                             SkBitmap::Config bitmap_config) {
+  int java_bitmap_config = SkBitmapConfigToBitmapFormat(bitmap_config);
+  return Java_BitmapHelper_createBitmap(
+      AttachCurrentThread(), width, height, java_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));
-  int java_bitmap_config = SkBitmapConfigToBitmapFormat(config);
+  SkBitmap::Config bitmap_config = skbitmap->getConfig();
+  DCHECK((bitmap_config == SkBitmap::kRGB_565_Config) ||
+         (bitmap_config == SkBitmap::kARGB_8888_Config));
   ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap(
-      skbitmap->width(), skbitmap->height(), java_bitmap_config);
+      skbitmap->width(), skbitmap->height(), bitmap_config);
   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 44 matching lines @@
       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;
   }
 }
 
 }  //  namespace gfx