Remove jpegs with uninitialized memory from Gold

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 387 matching lines @@
     push_src("image", folder, src);
 }
 
 static void push_brd_srcs(Path path) {
 
     const SkBitmapRegionDecoderInterface::Strategy strategies[] = {
             SkBitmapRegionDecoderInterface::kCanvas_Strategy,
             SkBitmapRegionDecoderInterface::kOriginal_Strategy
     };
 
+    const uint32_t sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 };

[scroggo, 2015/09/11 14:59:47]

Why did this move?

(I'm fine with the new location; I just do not understand the motivation for
moving.)

Ok, I think I follow: these are in the order that we check them. sampleSize used
to be in the innermost loop, and now it's in the outermost loop. That seems fine
to me to keep them in the order they'll be looked at.

[msarett, 2015/09/11 15:28:20]

Yes that's why.

+
     // We will only test to one backend (8888), but we will test all of the
     // color types that we need to decode to on this backend.
     const CodecSrc::DstColorType dstColorTypes[] = {
         CodecSrc::kGetFromCanvas_DstColorType,
         CodecSrc::kIndex8_Always_DstColorType,
         CodecSrc::kGrayscale_Always_DstColorType,
     };
 
     const BRDSrc::Mode modes[] = {
         BRDSrc::kFullImage_Mode,
         BRDSrc::kDivisor_Mode
     };
 
-    const uint32_t sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+    for (SkBitmapRegionDecoderInterface::Strategy strategy : strategies) {
 
-    for (SkBitmapRegionDecoderInterface::Strategy strategy : strategies) {
         // We disable png testing for kOriginal_Strategy because the implementation leaks
         // memory in our forked libpng.
         // TODO (msarett): Decide if we want to test pngs in this mode and how we might do this.
         if (SkBitmapRegionDecoderInterface::kOriginal_Strategy == strategy &&
                 (path.endsWith(".png") || path.endsWith(".PNG"))) {
             continue;
         }
-        for (CodecSrc::DstColorType dstColorType : dstColorTypes) {
-            if (brd_color_type_supported(strategy, dstColorType)) {
-                for (BRDSrc::Mode mode : modes) {
-                    for (uint32_t sampleSize : sampleSizes) {
+        for (uint32_t sampleSize : sampleSizes) {
+
+            // kOriginal_Strategy does not work for jpegs that are scaled to non-powers of two.
+            // We don't need to test this.  We know it doesn't work, and it causes images with
+            // uninitialized memory to show up on Gold.
+            if (SkBitmapRegionDecoderInterface::kOriginal_Strategy == strategy &&
+                    (path.endsWith(".jpg") || path.endsWith(".JPG") ||
+                    path.endsWith(".jpeg") || path.endsWith(".JPEG")) && !SkIsPow2(sampleSize)) {
+                continue;
+            }
+            for (CodecSrc::DstColorType dstColorType : dstColorTypes) {
+                if (brd_color_type_supported(strategy, dstColorType)) {
+                    for (BRDSrc::Mode mode : modes) {
                         push_brd_src(path, strategy, dstColorType, mode, sampleSize);
                     }
                 }
             }
         }
     }
 }
 
 static bool brd_supported(const char* ext) {
     static const char* const exts[] = {
@@ skipping 627 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif