GM: include filename extension (.png) of each output file in JSON summary

gm/gm_expectations.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 "gm_expectations.h"
 #include "SkBitmapHasher.h"
 #include "SkImageDecoder.h"
@@ skipping 123 matching lines @@
         Json::Value jsonValue;
         jsonValue[kJsonKey_ExpectedResults_AllowedBitmapHashes] = allowedChecksumArray;
         jsonValue[kJsonKey_ExpectedResults_IgnoreFailure] = this->ignoreFailure();
         return jsonValue;
     }
 
 
     // IndividualImageExpectationsSource class...
 
     Expectations IndividualImageExpectationsSource::get(const char *testName) {
-        SkString path = make_filename(fRootDir.c_str(), "", testName,
-                                      "png");
+        SkString path = make_filename(fRootDir.c_str(), "", testName, kPNG_FileExtension);
         SkBitmap referenceBitmap;
         bool decodedReferenceBitmap =
             SkImageDecoder::DecodeFile(path.c_str(), &referenceBitmap,
                                        SkBitmap::kARGB_8888_Config,
                                        SkImageDecoder::kDecodePixels_Mode,
                                        NULL);
         if (decodedReferenceBitmap) {
             return Expectations(referenceBitmap);
         } else {
             return Expectations();
         }
     }
 
 
     // JsonExpectationsSource class...
 
     JsonExpectationsSource::JsonExpectationsSource(const char *jsonPath) {
         parse(jsonPath, &fJsonRoot);
         fJsonExpectedResults = fJsonRoot[kJsonKey_ExpectedResults];
     }
 
     Expectations JsonExpectationsSource::get(const char *testName) {
-        return Expectations(fJsonExpectedResults[testName]);
+        SkString testNameWithExtension(testName);
+        testNameWithExtension.append(".");
+        testNameWithExtension.append(kPNG_FileExtension);

[epoger, 2013/05/08 19:57:16]

In patchset 3, we replace all appearances of ".png" and "png" with references to
a new kPNG_FileExtension constant.  It's bad that we make the png-only
assumption throughout, but at least there is now a term we can search for in the
code to fix these assumptions later.

+        return Expectations(fJsonExpectedResults[testNameWithExtension.c_str()]);
     }
 
     /*static*/ SkData* JsonExpectationsSource::readIntoSkData(SkStream &stream, size_t maxBytes) {
         if (0 == maxBytes) {
             return SkData::NewEmpty();
         }
         char* bufStart = reinterpret_cast<char *>(sk_malloc_throw(maxBytes));
         char* bufPtr = bufStart;
         size_t bytesRemaining = maxBytes;
         while (bytesRemaining > 0) {
@@ skipping 27 matching lines @@
         Json::Reader reader;
         if (!reader.parse(bytes, bytes+size, *jsonRoot)) {
             gm_fprintf(stderr, "error parsing JSON file %s\n", jsonPath);
             DEBUGFAIL_SEE_STDERR;
             return false;
         }
         return true;
     }
 
 }