Make BitmapRegionDecoder succeed on invalid requests

include/codec/SkAndroidCodec.h

Index: include/codec/SkAndroidCodec.h
diff --git a/include/codec/SkAndroidCodec.h b/include/codec/SkAndroidCodec.h
index f979886a43ec33c573de3553b49651a8a06d7025..afb86a9ea7a9acdb1ec5d5165e43cce3fb47bd4c 100644
--- a/include/codec/SkAndroidCodec.h
+++ b/include/codec/SkAndroidCodec.h
@@ -53,6 +53,23 @@ public:
     SkEncodedFormat getEncodedFormat() const { return this->onGetEncodedFormat(); }
 
     /**
+     *  @param requestedColorType Color type requested by the client

[djsollen, 2015/12/11 13:49:25]

When doxygen formats this comment this won't look quite right.  Each method
should have a description, which it looks like you put mostly in the @return
annotation.  I would just delete the @return and make those the main body of the
comment.

[msarett, 2015/12/11 14:17:53]

Done.  Also changing the comment to reflect that we default to the color type
recommended by the codec.

+     *
+     *  @return If it is possible to decode to requestedColorType, this returns
+     *          requestedColorType.  Otherwise, this returns kN32_SkColorType.
+     */
+    SkColorType computeOutputColorType(SkColorType requestedColorType);
+
+    /**
+     *  @param requestedUnpremul  Indicates if the client requested
+     *                            unpremultiplied output
+     *
+     *  @return Returns the appropriate alpha type to decode to.  If the image
+     *          has alpha, the value of requestedUnpremul will be honored.
+     */
+    SkAlphaType computeOutputAlphaType(bool requestedUnpremul);
+
+    /**
      *  Returns the dimensions of the scaled output image, for an input
      *  sampleSize.
      *