dm changes

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 139e9eb82396d35e09c69bfa979a321093b694fd..bf382edfd6ba59b4cd8cdd5b0359eacbe71b002a 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -207,14 +207,18 @@ 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_subset_kGray8", new CodecSrc(path,
+                    CodecSrc::kScanline_Subset_Mode, 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
-      case kIndex_8_SkColorType:
-          push_src("image", "codec_kIndex8", new CodecSrc(path, CodecSrc::kNormal_Mode,
-                  CodecSrc::kIndex8_Always_DstColorType));
-          push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
-                  CodecSrc::kIndex8_Always_DstColorType));
+        case kIndex_8_SkColorType:
+            push_src("image", "codec_kIndex8", new CodecSrc(path, CodecSrc::kNormal_Mode,
+                    CodecSrc::kIndex8_Always_DstColorType));
+            push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
+                    CodecSrc::kIndex8_Always_DstColorType));
+            push_src("image", "scanline_subset_kIndex8", new CodecSrc(path,
+                    CodecSrc::kScanline_Subset_Mode, CodecSrc::kIndex8_Always_DstColorType));
         break;

[msarett, 2015/05/22 17:42:18]

nit: The indentation is off here.  You didn't cause it (I probably did), but it
might be worth fixing while you are touching the code anyway.

       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", "scanline_subset", new CodecSrc(path, CodecSrc::kScanline_Subset_Mode,
+            CodecSrc::kGetFromCanvas_DstColorType));
 }
 
 static bool codec_supported(const char* ext) {