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

ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java

Index: ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
diff --git a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
index a936fe77b58f27469be022bd46e1d0df9acceb06..4b6d689697161f4abfff73ee492d1662bfd0d175 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
+++ b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
@@ -19,11 +19,9 @@ public class BitmapHelper {
     @CalledByNative
     private static Bitmap createBitmap(int width,
                                       int height,
-                                      boolean is565Config) {
-        if (is565Config) {
-            return Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
-        }
-        return Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+                                      int bitmapFormatValue) {
+        Bitmap.Config bitmapConfig = getJavabitmapConfig(bitmapFormatValue);
+        return Bitmap.createBitmap(width, height, bitmapConfig);
     }
 
     /**
@@ -83,7 +81,7 @@ public class BitmapHelper {
      * @return Matching integer constant for the Bitmap.Config value passed.
      */
     @CalledByNative
-    private static int bitmapConfig(Bitmap.Config bitmapConfig) {
+    private static int getConfigEnumValue(Bitmap.Config bitmapConfig) {

[bulach, 2014/03/04 13:05:13]

nit: how about "getBitmapFormatForConfig"
and the following "getBitmapConfigForFormat" so they're kind of symmetrical?

[sivag, 2014/03/04 13:57:55]

Done.

         switch (bitmapConfig) {
             case ALPHA_8:
                 return BitmapFormat.FORMAT_ALPHA_8;
@@ -97,4 +95,25 @@ public class BitmapHelper {
                 return BitmapFormat.FORMAT_NO_CONFIG;
         }
     }
+
+     /**
+     * Provides a matching Bitmap.Config for the enum config value passed.
+     *
+     * @param bitmapFormatValue The Bitmap Configuration enum value.
+     * @return Matching Bitmap.Config  for the enum value passed.
+     */
+    private static Bitmap.Config getJavabitmapConfig(int bitmapFormatValue) {

[bulach, 2014/03/04 13:05:13]

nit: I'd prefer my suggestion above, but if we decide not to go with it,
s/getJavabitmap/getJavaBitmap/

[sivag, 2014/03/04 13:57:55]

Done.

+        switch (bitmapFormatValue) {
+            case BitmapFormat.FORMAT_ALPHA_8:
+                return Bitmap.Config.ALPHA_8;
+            case BitmapFormat.FORMAT_ARGB_4444:
+                return Bitmap.Config.ARGB_4444;
+            case BitmapFormat.FORMAT_RGB_565:
+                return Bitmap.Config.RGB_565;
+            case BitmapFormat.FORMAT_ARGB_8888:
+                default:

[bulach, 2014/03/04 13:05:13]

nit: unindent "default" and keep at the same level as the "case"

[sivag, 2014/03/04 13:57:55]

Done.

+                return Bitmap.Config.ARGB_8888;
+        }
+    }
+
 }