color: Make images without embedded profiles sRGB by default

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 84 matching lines @@
     m_bitmap.reset();
     return other.m_bitmap.copyTo(&m_bitmap, other.m_bitmap.colorType());
 }
 
 bool ImageFrame::setSizeAndColorProfile(int newWidth, int newHeight, const ICCProfile& newIccProfile)
 {
     // setSizeAndColorProfile() should only be called once, it leaks memory otherwise.
     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));
     if (!m_bitmap.tryAllocPixels(m_allocator, 0))
         return false;
 
     zeroFillPixelData();
     return true;
 }
 
@@ skipping 35 matching lines @@
     // If the frame is not fully loaded, there will be transparent pixels,
     // so we can't tell skia we're opaque, even for image types that logically
     // always are (e.g. jpeg).
     if (!m_hasAlpha && m_status == FrameComplete)
         return kOpaque_SkAlphaType;
 
     return m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType;
 }
 
 } // namespace blink