Pass format as argument to getContentBitmapAsync.

getScaledContentbitmap can process and give output
in the requested format. getContentBitmapAsync should have
this support. Especially on low-end devices we may need
bitmaps with 16-bit formats.

BUG=472457

Review URL: https://codereview.chromium.org/1021863005

Cr-Commit-Position: refs/heads/master@{#323194}

1 files changed, 3 insertions, 2 deletions

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java
index ded0664..a84e44f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java
@@ -78,10 +78,11 @@ public abstract class ContentReadbackHandler {
      * @param srcRect  A subrect of the original content to capture. If this is empty, it will grab
      *                 the whole surface.
      * @param view  The {@link ContentViewCore} to grab the bitmap from.
+     * @param config  The output content bitmap configuration.
      * @param callback The callback to be executed after readback completes.
      */
     public void getContentBitmapAsync(float scale, Rect srcRect, ContentViewCore view,
-            GetBitmapCallback callback) {
+            Bitmap.Config config, GetBitmapCallback callback) {
         if (!readyForReadback()) {
             callback.onFinishGetBitmap(null);
             return;
@@ -91,7 +92,7 @@ public abstract class ContentReadbackHandler {
         int readbackId = mNextReadbackId++;
         mGetBitmapRequests.put(readbackId, callback);
         nativeGetContentBitmap(mNativeContentReadbackHandler, readbackId, scale,
-                Bitmap.Config.ARGB_8888, srcRect.top, srcRect.left, srcRect.width(),
+                config, srcRect.top, srcRect.left, srcRect.width(),
                 srcRect.height(), view);
     }