Remove obsolete image codec colorspace hacks.

src/codec/SkCodecImageGenerator.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 "SkCodecImageGenerator.h"
-#include "SkPM4fPriv.h"
 
 SkImageGenerator* SkCodecImageGenerator::NewFromEncodedCodec(SkData* data) {
     SkCodec* codec = SkCodec::NewFromData(data);
     if (nullptr == codec) {
         return nullptr;
     }
 
     return new SkCodecImageGenerator(codec, data);
 }
 
-// FIXME: We should expose information about the encoded format on the
-//        SkImageGenerator, so the client can interpret the encoded
-//        format and request an output format.  For now, as a workaround,
-//        we guess what output format the client wants.
-static SkImageInfo fix_info(const SkCodec& codec) {
-    const SkImageInfo& info = codec.getInfo();
-    SkAlphaType alphaType = (kUnpremul_SkAlphaType == info.alphaType()) ? kPremul_SkAlphaType :
-            info.alphaType();
-
-    SkColorProfileType profileType = kLinear_SkColorProfileType;
-    // Crudely guess that the presence of a color space means sRGB, or obey the global sRGB
-    // selector.
-    if (gTreatSkColorAsSRGB || codec.getColorSpace()) {
-        profileType = kSRGB_SkColorProfileType;
+static SkImageInfo make_premul(const SkImageInfo& info) {
+    if (kUnpremul_SkAlphaType == info.alphaType()) {
+        return info.makeAlphaType(kPremul_SkAlphaType);
     }
 
-    return SkImageInfo::Make(info.width(), info.height(), info.colorType(), alphaType, profileType);
+    return info;
 }
 
 SkCodecImageGenerator::SkCodecImageGenerator(SkCodec* codec, SkData* data)
-    : INHERITED(fix_info(*codec))
+    : INHERITED(make_premul(codec->getInfo()))
     , fCodec(codec)
     , fData(SkRef(data))
 {}
 
 SkData* SkCodecImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) {
     return SkRef(fData.get());
 }
 
 bool SkCodecImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
         SkPMColor ctable[], int* ctableCount) {
@@ skipping 18 matching lines @@
     SkCodec::Result result = fCodec->getYUV8Planes(sizeInfo, planes);
 
     switch (result) {
         case SkCodec::kSuccess:
         case SkCodec::kIncompleteInput:
             return true;
         default:
             return false;
     }
 }