Refactor image decoders to use 'colorSpace' instead of 'colorProfile'

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 85 matching lines @@
   DCHECK_NE(this, other);
   if (other->m_bitmap.isImmutable())
     return false;
   m_hasAlpha = other->m_hasAlpha;
   m_bitmap.reset();
   m_bitmap.swap(other->m_bitmap);
   other->m_status = FrameEmpty;
   return true;
 }
 
-bool ImageFrame::setSizeAndColorProfile(int newWidth,
-                                        int newHeight,
-                                        const ICCProfile& newIccProfile) {
+bool ImageFrame::setSizeAndColorSpace(int newWidth,
+                                      int newHeight,
+                                      sk_sp<SkColorSpace> colorSpace) {
   // setSizeAndColorProfile() should only be called once, it leaks memory
   // otherwise.
   ASSERT(!width() && !height());
 
-  sk_sp<SkColorSpace> colorSpace;
   if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
-    if (newIccProfile.isEmpty())
+    if (!colorSpace)
       colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
-    else
-      colorSpace =
-          SkColorSpace::NewICC(newIccProfile.data(), newIccProfile.size());
-    DCHECK(colorSpace);

[msarett, 2016/10/27 15:43:22]

We lose the debug check for icc profiles that we fail to parse.

Maybe I should add this back in ImageDecoder.cpp (guarded or not by the color
correct rendering flag)?

I find it a little strange because there definitely are a small number of
garbage "profiles" on the web that we will correctly not parse.  But it could
also help catch bugs.

[ccameron, 2016/10/27 22:36:11]

This doesn't worry me ATM -- indeed we may want to do histogramming in
ImageDecoder about what we failed to parse and how.

   }
 
   m_bitmap.setInfo(SkImageInfo::MakeN32(
       newWidth, newHeight,
       m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType,
-      colorSpace));
+      std::move(colorSpace)));
   if (!m_bitmap.tryAllocPixels(m_allocator, 0))
     return false;
 
   zeroFillPixelData();
   return true;
 }
 
 bool ImageFrame::hasAlpha() const {
   return m_hasAlpha;
 }
@@ skipping 36 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