Assign sRGB color space to unmarked jpegs and pngs

src/codec/SkPngCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 590 matching lines @@
     autoClean.release();
     if (png_ptrp) {
         *png_ptrp = png_ptr;
     }
     if (info_ptrp) {
         *info_ptrp = info_ptr;
     }
 
     if (outCodec) {
         sk_sp<SkColorSpace> colorSpace = read_color_space(png_ptr, info_ptr);
+        if (!colorSpace) {
+            // Treat unmarked pngs as sRGB.
+            colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        }
+
         SkEncodedInfo info = SkEncodedInfo::Make(color, alpha, 8);
 
         if (1 == numberPasses) {
             *outCodec = new SkPngScanlineDecoder(origWidth, origHeight, info, stream,
                     chunkReader, png_ptr, info_ptr, bitDepth, colorSpace);
         } else {
             *outCodec = new SkPngInterlacedScanlineDecoder(origWidth, origHeight, info, stream,
                     chunkReader, png_ptr, info_ptr, bitDepth, numberPasses, colorSpace);
         }
     }
@@ skipping 181 matching lines @@
     SkCodec* outCodec;
     if (read_header(stream, chunkReader, &outCodec, nullptr, nullptr)) {
         // Codec has taken ownership of the stream.
         SkASSERT(outCodec);
         streamDeleter.release();
         return outCodec;
     }
 
     return nullptr;
 }