dm changes

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 189 matching lines @@
         return;
     }
 
     // Build additional test cases for images that decode natively to non-canvas types
     switch(codec->getInfo().colorType()) {
         case kGray_8_SkColorType:
             push_src("image", "codec_kGray8", new CodecSrc(path, CodecSrc::kNormal_Mode,
                     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
         break;
     }
 
     // Decode all images to the canvas color type
     push_src("image", "codec", new CodecSrc(path, CodecSrc::kNormal_Mode,
             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) {
     // FIXME: Once other versions of SkCodec are available, we can add them to this
     // list (and eventually we can remove this check once they are all supported).
     static const char* const exts[] = {
         "bmp", "gif", "jpg", "jpeg", "png", "ico", "wbmp",
         "BMP", "GIF", "JPG", "JPEG", "PNG", "ICO", "WBMP"
     };
 
@@ skipping 519 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif