[Android] Support ALPHA_8 UI resources

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 68 matching lines @@
   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(const JavaBitmap& jbitmap) {
-  // TODO(jdduke): Convert to DCHECK's when sufficient data has been capture for
-  // crbug.com/341406.
-  CHECK_EQ(jbitmap.format(), ANDROID_BITMAP_FORMAT_RGBA_8888);
-  CHECK(!jbitmap.size().IsEmpty());
-  CHECK_GT(jbitmap.stride(), 0U);
-  CHECK(jbitmap.pixels());
+  DCHECK(!jbitmap.size().IsEmpty());
+  DCHECK_GT(jbitmap.stride(), 0U);
+  DCHECK(jbitmap.pixels());
 
   gfx::Size src_size = jbitmap.size();
 
   SkBitmap skbitmap;
-  skbitmap.allocPixels(SkImageInfo::MakeN32Premul(src_size.width(),
-                                                  src_size.height()),
-                       jbitmap.stride());
+  switch (jbitmap.format()) {
+    case ANDROID_BITMAP_FORMAT_RGBA_8888:
+      skbitmap.allocPixels(SkImageInfo::MakeN32Premul(src_size.width(),
+                                                      src_size.height()),
+                           jbitmap.stride());
+      break;
+    case ANDROID_BITMAP_FORMAT_A_8:
+      skbitmap.allocPixels(SkImageInfo::MakeA8(src_size.width(),
+                                               src_size.height()),
+                           jbitmap.stride());
+      break;
+    default:
+      CHECK(false) << "Invalid Java bitmap format: " << jbitmap.format();
+      break;
+  }
   const void* src_pixels = jbitmap.pixels();
   void* dst_pixels = skbitmap.getPixels();
   memcpy(dst_pixels, src_pixels, skbitmap.getSize());
 
   return skbitmap;
 }
 
 SkColorType ConvertToSkiaColorType(jobject bitmap_config) {
   int jbitmap_config = Java_BitmapHelper_getBitmapFormatForConfig(
       AttachCurrentThread(), bitmap_config);
   switch (jbitmap_config) {
     case BITMAP_FORMAT_ALPHA_8:
       return kAlpha_8_SkColorType;
     case BITMAP_FORMAT_ARGB_4444:
       return kARGB_4444_SkColorType;
     case BITMAP_FORMAT_ARGB_8888:
       return kN32_SkColorType;
     case BITMAP_FORMAT_RGB_565:
       return kRGB_565_SkColorType;
     case BITMAP_FORMAT_NO_CONFIG:
     default:
       return kUnknown_SkColorType;
   }
 }
 
 }  //  namespace gfx