Support format using enum argument for Async readback

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index c1dbae2b428c0cfa11720df6cf9648711edfa667..f5ecca497f70000ed1ceae1703ca52c00462e1d1 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -628,7 +628,11 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& dst_size,
     const base::Callback<void(bool, const SkBitmap&)>& callback,
-    bool readback_config_rgb565) {
+    const SkBitmap::Config bitmap_config) {
+  // Only ARGB888 and RGB565 supported as of now.
+  DCHECK((bitmap_config == SkBitmap::kRGB_565_Config) ||
+         (bitmap_config == SkBitmap::kARGB_8888_Config));
+
   if (!using_synchronous_compositor_ && !IsSurfaceAvailableForCopy()) {
     callback.Run(false, SkBitmap());
     return;
@@ -639,7 +643,8 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(
   if (!gl_helper)
     return;
   bool check_rgb565_support = gl_helper->CanUseRgb565Readback();
-  if (readback_config_rgb565 && !check_rgb565_support) {
+  if ((bitmap_config == SkBitmap::kRGB_565_Config) &&
+      !check_rgb565_support) {
     LOG(ERROR) << "Readbackformat rgb565  not supported";
     callback.Run(false, SkBitmap());
     return;
@@ -669,7 +674,7 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(
       request = cc::CopyOutputRequest::CreateRequest(base::Bind(
           &RenderWidgetHostViewAndroid::PrepareTextureCopyOutputResult,
           dst_size_in_pixel,
-          readback_config_rgb565,
+          bitmap_config,
           callback));
   }
   request->set_area(src_subrect_in_pixel);
@@ -1391,7 +1396,7 @@ void RenderWidgetHostViewAndroid::OnLostResources() {
 // static
 void RenderWidgetHostViewAndroid::PrepareTextureCopyOutputResult(
     const gfx::Size& dst_size_in_pixel,
-    bool readback_config_rgb565,
+    const SkBitmap::Config bitmap_config,
     const base::Callback<void(bool, const SkBitmap&)>& callback,
     scoped_ptr<cc::CopyOutputResult> result) {
   DCHECK(result->HasTexture());
@@ -1402,9 +1407,6 @@ void RenderWidgetHostViewAndroid::PrepareTextureCopyOutputResult(
     return;
 
   scoped_ptr<SkBitmap> bitmap(new SkBitmap);
-  SkBitmap::Config bitmap_config = readback_config_rgb565 ?
-                                   SkBitmap::kRGB_565_Config :
-                                   SkBitmap::kARGB_8888_Config;
   bitmap->setConfig(bitmap_config,
                     dst_size_in_pixel.width(),
                     dst_size_in_pixel.height(),
@@ -1438,7 +1440,7 @@ void RenderWidgetHostViewAndroid::PrepareTextureCopyOutputResult(
       gfx::Rect(result->size()),
       dst_size_in_pixel,
       pixels,
-      readback_config_rgb565,
+      bitmap_config,
       base::Bind(&CopyFromCompositingSurfaceFinished,
                  callback,
                  base::Passed(&release_callback),