Mark webps as sRGB

src/codec/SkWebpCodec.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 "SkCodecPriv.h"
 #include "SkWebpCodec.h"
 #include "SkTemplates.h"
@@ skipping 67 matching lines @@
     SkImageInfo info;
     if (webp_parse_header(stream, &info)) {
         return new SkWebpCodec(info, streamDeleter.release());
     }
     return nullptr;
 }
 
 // This version is slightly different from SkCodecPriv's version of conversion_possible. It
 // supports both byte orders for 8888.
 static bool webp_conversion_possible(const SkImageInfo& dst, const SkImageInfo& src) {
-    if (dst.profileType() != src.profileType()) {
-        return false;
-    }
+    // FIXME: skbug.com/4895
+    // Currently, we ignore the SkColorProfileType on the SkImageInfo.  We
+    // will treat the encoded data as linear regardless of what the client

[scroggo, 2016/04/07 12:35:54]

linear? I thought this CL's whole purpose was to treat them as sRGB?

[msarett, 2016/04/07 13:03:52]

Well, we want to mark them as sRGB.  I think treating them as sRGB is still a
work in progress - both on our end and with Herb's work.

But I think it helps Herb to see them marked proerly as sRGB.

We'll still do the same decode regardless of whether the client asks for sRGB or
linear (which may be correct or incorrect, I'm not sure).  The comment should
probably say - "We will treat the encoded data the same way regardless of what
the client requests."

FWIW, I copied this comment from conversion_possible() SkCodecPriv.h.

+    // requests.
 
     if (!valid_alpha(dst.alphaType(), src.alphaType())) {
         return false;
     }
 
     switch (dst.colorType()) {
         // Both byte orders are supported.
         case kBGRA_8888_SkColorType:
         case kRGBA_8888_SkColorType:
             return true;
@@ skipping 144 matching lines @@
             case VP8_STATUS_SUSPENDED:
                 // Break out of the switch statement. Continue the loop.
                 break;
             default:
                 return kInvalidInput;
         }
     }
 }
 
 SkWebpCodec::SkWebpCodec(const SkImageInfo& info, SkStream* stream)
-    : INHERITED(info, stream) {}
+    // The spec says an unmarked image is sRGB, so we return that space here.
+    // TODO: Add support for parsing ICC profiles from webps.
+    : INHERITED(info, stream, SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)) {}