Color: Add ColorCorrectRendering flag

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 180328041303ac23bdf9b5d472a183b5203bac5c..6a4db8fa2d711b56af64eac34f940d4fd870781b 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
@@ -24,6 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "platform/image-decoders/ImageFrame.h"
+
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/image-decoders/ImageDecoder.h"
 
 namespace blink {
@@ -98,11 +101,12 @@ bool ImageFrame::setSizeAndColorProfile(int newWidth, int newHeight, const ICCPr
     // setSizeAndColorProfile() should only be called once, it leaks memory otherwise.
     ASSERT(!width() && !height());
 
-    // TODO(ccameron): Populate the color space parameter of the SkImageInfo
-    // with newIccProfile, under a runtime flag.
+    sk_sp<SkColorSpace> colorSpace;
+    if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled() && !newIccProfile.isEmpty())
+        colorSpace = SkColorSpace::NewICC(newIccProfile.data(), newIccProfile.size());
 
     m_bitmap.setInfo(SkImageInfo::MakeN32(newWidth, newHeight,
-        m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType));
+        m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType, colorSpace));
     if (!m_bitmap.tryAllocPixels(m_allocator, 0))
         return false;