| 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 5c4549cd9d8f03ebd7154a012c2e2721edf0ca01..8ffaae4b0937124f44f7da6e869b019566f1fe71 100644
|
| --- a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
|
| +++ b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
|
| @@ -85,15 +85,15 @@ public class BitmapHelper {
|
| private static int getBitmapFormatForConfig(Bitmap.Config bitmapConfig) {
|
| switch (bitmapConfig) {
|
| case ALPHA_8:
|
| - return BitmapFormat.FORMAT_ALPHA_8;
|
| + return BitmapFormat.ALPHA_8;
|
| case ARGB_4444:
|
| - return BitmapFormat.FORMAT_ARGB_4444;
|
| + return BitmapFormat.ARGB_4444;
|
| case ARGB_8888:
|
| - return BitmapFormat.FORMAT_ARGB_8888;
|
| + return BitmapFormat.ARGB_8888;
|
| case RGB_565:
|
| - return BitmapFormat.FORMAT_RGB_565;
|
| + return BitmapFormat.RGB_565;
|
| default:
|
| - return BitmapFormat.FORMAT_NO_CONFIG;
|
| + return BitmapFormat.NO_CONFIG;
|
| }
|
| }
|
|
|
| @@ -105,13 +105,13 @@ public class BitmapHelper {
|
| */
|
| private static Bitmap.Config getBitmapConfigForFormat(int bitmapFormatValue) {
|
| switch (bitmapFormatValue) {
|
| - case BitmapFormat.FORMAT_ALPHA_8:
|
| + case BitmapFormat.ALPHA_8:
|
| return Bitmap.Config.ALPHA_8;
|
| - case BitmapFormat.FORMAT_ARGB_4444:
|
| + case BitmapFormat.ARGB_4444:
|
| return Bitmap.Config.ARGB_4444;
|
| - case BitmapFormat.FORMAT_RGB_565:
|
| + case BitmapFormat.RGB_565:
|
| return Bitmap.Config.RGB_565;
|
| - case BitmapFormat.FORMAT_ARGB_8888:
|
| + case BitmapFormat.ARGB_8888:
|
| default:
|
| return Bitmap.Config.ARGB_8888;
|
| }
|
|
|