color: Make images without embedded profiles sRGB by default

third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp

Index: third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
index 6a4db8fa2d711b56af64eac34f940d4fd870781b..360261f9cbed7f7e6e5ae4129fe26c34da9da3cd 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
@@ -102,8 +102,12 @@ bool ImageFrame::setSizeAndColorProfile(int newWidth, int newHeight, const ICCPr
     ASSERT(!width() && !height());
 
     sk_sp<SkColorSpace> colorSpace;
-    if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled() && !newIccProfile.isEmpty())
-        colorSpace = SkColorSpace::NewICC(newIccProfile.data(), newIccProfile.size());
+    if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
+        if (newIccProfile.isEmpty())
+            colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        else
+            colorSpace = SkColorSpace::NewICC(newIccProfile.data(), newIccProfile.size());

[msarett, 2016/09/21 12:06:40]

NewICC() might fail (return nullptr)  - if the input data is bad or if the
profile is one that we don't yet recognize.  Should we set also set the
colorSpace to sRGB if NewICC() returns nullptr?

[ccameron, 2016/09/21 18:23:02]

I was considering to add an ASSERT for that, rather than silently failing. This
is still behind a flag, so the more landmines the better IMO.

Changed this to an ASSERT.

[msarett, 2016/09/21 18:28:42]

ASSERT seems good for now - especially if it helps us recognize profiles that we
aren't parsing correctly.  I would love to see those :).

When this gets turned on, we'll obviously need to do something different (I
think setting to sRGB makes sense).  There certainly are images on the web that
say they have ICC profiles and then give us garabage...

+    }
 
     m_bitmap.setInfo(SkImageInfo::MakeN32(newWidth, newHeight,
         m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType, colorSpace));