SkBitmapRegionDecoder clean-up

tools/SkBitmapRegionSampler.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkBitmapRegionDecoderInterface.h"
 #include "SkImageDecoder.h"
@@ skipping 14 matching lines @@
     /*
      * 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 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;
 
     typedef SkBitmapRegionDecoderInterface INHERITED;
 
 };