Reenable 16-bit png brd decode tests

I accidentally turned these off in:
https://skia-review.googlesource.com/c/6023/

Even though the decode color type does not match the canvas,
we still want to run the test.

BUG=skia:

Change-Id: Ia96069a44e20d62a58d37a98bac81cfab5470fc0
Reviewed-on: https://skia-review.googlesource.com/6088
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 197dcc1..78e9c55 100644 (file)
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -148,9 +148,6 @@ Error BRDSrc::draw(SkCanvas* canvas) const {
                     fSampleSize, colorType, false)) {
                 return "Cannot decode (full) region.";
             }
-            if (colorType != bitmap.colorType()) {
-                return Error::Nonfatal("Cannot convert to color type.");
-            }
             canvas->drawBitmap(bitmap, 0, 0);
             return "";
         }
@@ -204,9 +201,6 @@ Error BRDSrc::draw(SkCanvas* canvas) const {
                             decodeTop, decodeWidth, decodeHeight), fSampleSize, colorType, false)) {
                         return "Cannot decode region.";
                     }
-                    if (colorType != bitmap.colorType()) {
-                        return Error::Nonfatal("Cannot convert to color type.");
-                    }
 
                     canvas->drawBitmapRect(bitmap,
                             SkRect::MakeXYWH((SkScalar) scaledBorder, (SkScalar) scaledBorder,