Refactor SkBitmapRegionDecoderInterface for Android

tools/SkBitmapRegionCodec.h

Index: tools/SkBitmapRegionCodec.h
diff --git a/tools/SkBitmapRegionCodec.h b/tools/SkBitmapRegionCodec.h
index 14d024ea4542ed8d5c49ff237644109858c05410..4dd69ab0fa071059d0cab1f5e368a6c6e10e016f 100644
--- a/tools/SkBitmapRegionCodec.h
+++ b/tools/SkBitmapRegionCodec.h
@@ -20,15 +20,9 @@ public:
      */
     SkBitmapRegionCodec(SkAndroidCodec* codec);
 
-    /*
-     * Three differences from the Android version:
-     *     Returns a Skia bitmap instead of an Android bitmap.
-     *     Android version attempts to reuse a recycled bitmap.
-     *     Removed the options object and used parameters for color type and
-     *     sample size.
-     */
-    SkBitmap* decodeRegion(int start_x, int start_y, int width, int height,
-                           int sampleSize, SkColorType prefColorType) override;
+    bool decodeRegion(SkBitmap* bitmap, SkBitmap::Allocator* allocator,
+                      const SkIRect& desiredSubset, int sampleSize,
+                      SkColorType colorType, bool requireUnpremul) override;
 
     bool conversionSupported(SkColorType colorType) override;