[devtools] Support different encodings for Page.CaptureScreenshot.

ui/snapshot/snapshot_async.cc

Index: ui/snapshot/snapshot_async.cc
diff --git a/ui/snapshot/snapshot_async.cc b/ui/snapshot/snapshot_async.cc
index a4f0eb07bc44b9abab830015667ef94dd1f36eab..173f70a56acf24d884f37ef26e05b303efb06936 100644
--- a/ui/snapshot/snapshot_async.cc
+++ b/ui/snapshot/snapshot_async.cc
@@ -10,8 +10,6 @@
 #include "base/task_runner_util.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkPixelRef.h"
-#include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ -34,29 +32,6 @@ SkBitmap ScaleBitmap(const SkBitmap& input_bitmap,
                                        static_cast<SkBitmap::Allocator*>(NULL));
 }
 
-scoped_refptr<base::RefCountedBytes> EncodeBitmap(const SkBitmap& bitmap) {
-  scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes);
-  SkAutoLockPixels lock(bitmap);
-  unsigned char* pixels = reinterpret_cast<unsigned char*>(bitmap.getPixels());
-#if SK_A32_SHIFT == 24 && SK_R32_SHIFT == 16 && SK_G32_SHIFT == 8
-  gfx::PNGCodec::ColorFormat kColorFormat = gfx::PNGCodec::FORMAT_BGRA;
-#elif SK_A32_SHIFT == 24 && SK_B32_SHIFT == 16 && SK_G32_SHIFT == 8
-  gfx::PNGCodec::ColorFormat kColorFormat = gfx::PNGCodec::FORMAT_RGBA;
-#else
-#error Unknown color format
-#endif
-  if (!gfx::PNGCodec::Encode(pixels,
-                             kColorFormat,
-                             gfx::Size(bitmap.width(), bitmap.height()),
-                             base::checked_cast<int>(bitmap.rowBytes()),
-                             true,
-                             std::vector<gfx::PNGCodec::Comment>(),
-                             &png_data->data())) {
-    return scoped_refptr<base::RefCountedBytes>();
-  }
-  return png_data;
-}
-
 }  // namespace
 
 void SnapshotAsync::ScaleCopyOutputResult(
@@ -80,24 +55,15 @@ void SnapshotAsync::ScaleCopyOutputResult(
       base::Bind(&OnFrameScalingFinished, callback));
 }
 
-void SnapshotAsync::EncodeCopyOutputResult(
-    const GrabWindowSnapshotAsyncPNGCallback& callback,
-    scoped_refptr<base::TaskRunner> background_task_runner,
+void SnapshotAsync::RunCallbackWithCopyOutputResult(
+    const GrabWindowSnapshotAsyncCallback& callback,
     std::unique_ptr<cc::CopyOutputResult> result) {
   if (result->IsEmpty()) {
-    callback.Run(scoped_refptr<base::RefCountedBytes>());
+    callback.Run(gfx::Image());
     return;
   }
 
-  // TODO(sergeyu): Potentially images can be scaled on GPU before reading it
-  // from GPU. Image scaling is implemented in content::GlHelper, but it's can't
-  // be used here because it's not in content/public. Move the scaling code
-  // somewhere so that it can be reused here.
-  base::PostTaskAndReplyWithResult(
-      background_task_runner.get(),
-      FROM_HERE,
-      base::Bind(EncodeBitmap, *result->TakeBitmap()),
-      callback);
+  callback.Run(gfx::Image::CreateFrom1xBitmap(*result->TakeBitmap()));
 }
 
 }  // namespace ui