SkBitmapRegionDecoder clean-up

tools/SkBitmapRegionSampler.h

Index: tools/SkBitmapRegionSampler.h
diff --git a/tools/SkBitmapRegionSampler.h b/tools/SkBitmapRegionSampler.h
index d2f738d3b5545d220c4d00cacf5f7ca855b30fd2..8ed95e25249b1cd4092fd095ca601c8c4164a33d 100644
--- a/tools/SkBitmapRegionSampler.h
+++ b/tools/SkBitmapRegionSampler.h
@@ -32,6 +32,14 @@ public:
     SkBitmap* decodeRegion(int start_x, int start_y, int width, int height,
                            int sampleSize, SkColorType prefColorType) override;
 
+    bool conversionSupported(SkColorType colorType) override {
+        // SkBitmapRegionSampler does not allow the client to check if the conversion
+        // is supported.  We will return true as a default.  If the conversion is in
+        // fact not supported, decodeRegion() will ignore the prefColorType and choose
+        // its own color type.  We catch this and fail non-fatally in our test code.
+        return true;
+    }
+
 private:
 
     SkAutoTDelete<SkImageDecoder> fDecoder;