Make kInvalidConversion a fatal failure in DMSrcSink

We just need to abort early on tests that we know
are invalid conversions.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1704433003

Review URL: https://codereview.chromium.org/1704433003

1 files changed, 6 insertions, 6 deletions

diff --git a/dm/DM.cpp b/dm/DM.cpp
index c87f578bab..c8b65842d0 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -354,14 +354,14 @@ static void push_codec_srcs(Path path) {
     uint32_t numColorTypes;
     switch (codec->getInfo().colorType()) {
         case kGray_8_SkColorType:
-            // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
-            // Further discussion on this topic is at https://bug.skia.org/3683 .
-            // This causes us to try to convert grayscale jpegs to kIndex8.  We currently
-            // fail non-fatally in this case.
             colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;
             colorTypes[1] = CodecSrc::kGrayscale_Always_DstColorType;
-            colorTypes[2] = CodecSrc::kIndex8_Always_DstColorType;
-            numColorTypes = 3;
+            if (kWBMP_SkEncodedFormat == codec->getEncodedFormat()) {
+                colorTypes[2] = CodecSrc::kIndex8_Always_DstColorType;
+                numColorTypes = 3;
+            } else {
+                numColorTypes = 2;
+            }
             break;
         case kIndex_8_SkColorType:
             colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;