dm changes

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 139e9eb82396d35e09c69bfa979a321093b694fd..1252d4f1f2dd9fc2bf31353a24184e7bb1c72a75 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -207,6 +207,8 @@ static void push_codec_srcs(Path path) {
                     CodecSrc::kGrayscale_Always_DstColorType));
             push_src("image", "scanline_kGray8", new CodecSrc(path, CodecSrc::kScanline_Mode,
                     CodecSrc::kGrayscale_Always_DstColorType));
+            push_src("image", "scanline_kGray8", new CodecSrc(path, CodecSrc::kSubset_Mode,

[msarett, 2015/05/19 14:01:13]

"subset_kGray8"

+                    CodecSrc::kGrayscale_Always_DstColorType));
             // Intentional fall through
             // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
             // Further discussion on this topic is at skbug.com/3683
@@ -215,6 +217,8 @@ static void push_codec_srcs(Path path) {
                   CodecSrc::kIndex8_Always_DstColorType));
           push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
                   CodecSrc::kIndex8_Always_DstColorType));
+          push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kSubset_Mode,

[msarett, 2015/05/19 14:01:13]

"subset_kIndex8"

+                  CodecSrc::kIndex8_Always_DstColorType));
         break;
       default:
         // Do nothing
@@ -226,6 +230,8 @@ static void push_codec_srcs(Path path) {
             CodecSrc::kGetFromCanvas_DstColorType));
     push_src("image", "scanline", new CodecSrc(path, CodecSrc::kScanline_Mode,
             CodecSrc::kGetFromCanvas_DstColorType));
+    push_src("image", "subset", new CodecSrc(path, CodecSrc::kSubset_Mode,

[msarett, 2015/05/19 14:01:13]

I think we use the same two tags (image, subset) for SkImageDecoder subset
decodes.  We would want subset decodes from SkCodec to be labeled uniquely.

I'm pretty sure the first tag has to be "image" (Leon can you confirm?).  We
should choose a different tag for the second one.  Also, whatever name we choose
here should be used in the above names.

[scroggo, 2015/05/19 15:21:41]

Agreed on all counts. So the first one should be "image", and for the second
one, maybe we should use "scanline_subset"? It gets a little unwieldy once we
append kIndex8 or kGray8 to the end, but maybe that's okay.

[emmaleer, 2015/05/21 17:51:13]

Acknowledged.

+            CodecSrc::kGetFromCanvas_DstColorType));
 }
 
 static bool codec_supported(const char* ext) {