Refactor SkBitmapRegionDecoderInterface for Android

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "nanobench.h"
@@ skipping 585 matching lines @@
 static bool valid_brd_bench(SkData* encoded, SkBitmapRegionDecoderInterface::Strategy strategy,
         SkColorType colorType, uint32_t sampleSize, uint32_t minOutputSize, int* width,
         int* height) {
     SkAutoTDelete<SkBitmapRegionDecoderInterface> brd(
             SkBitmapRegionDecoderInterface::CreateBitmapRegionDecoder(encoded, strategy));
     if (nullptr == brd.get()) {
         // This is indicates that subset decoding is not supported for a particular image format.
         return false;
     }
 
-    SkAutoTDelete<SkBitmap> bitmap(brd->decodeRegion(0, 0, brd->width(), brd->height(), 1,
-            colorType));
-    if (nullptr == bitmap.get() || colorType != bitmap->colorType()) {
-        // This indicates that conversion to the requested color type is not supported for the
-        // particular image.
+    SkIRect subset = SkIRect::MakeXYWH(0, 0, brd->width(), brd->height());
+    SkImageInfo info;
+    if (!brd->prepareRegion(subset, 1, colorType, false, &info)) {
+        // This indicates that conversion to the requested color type is not supported
+        // or another parameter is invalid.
         return false;
     }
+    if (SkBitmapRegionDecoderInterface::kOriginal_Strategy == strategy) {
+        SkBitmap bitmap;
+        if (!brd->decodeRegion(bitmap) || colorType != bitmap.colorType()) {
+            // This indicates that conversion to the requested color type is not
+            // supported for the particular image.
+            return false;
+        }
+    }
 
     if (sampleSize * minOutputSize > (uint32_t) brd->width() || sampleSize * minOutputSize >
             (uint32_t) brd->height()) {
         // This indicates that the image is not large enough to decode a
         // minOutputSize x minOutputSize subset at the given sampleSize.
         return false;
     }
 
     // Set the image width and height.  The calling code will use this to choose subsets to decode.
     *width = brd->width();
@@ skipping 741 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif