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

third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
 #include "platform/graphics/cpu/mips/WebGLImageConversionMSA.h"
 #include "platform/graphics/cpu/x86/WebGLImageConversionSSE.h"
@@ skipping 2671 matching lines @@
   checkedValue += skipSize.ValueOrDie();
   if (!checkedValue.IsValid())
     return GL_INVALID_VALUE;
   return GL_NO_ERROR;
 }
 
 WebGLImageConversion::ImageExtractor::ImageExtractor(
     Image* image,
     ImageHtmlDomSource imageHtmlDomSource,
     bool premultiplyAlpha,
-    bool ignoreGammaAndColorProfile) {
+    bool ignoreColorSpace) {
   m_image = image;
   m_imageHtmlDomSource = imageHtmlDomSource;
-  extractImage(premultiplyAlpha, ignoreGammaAndColorProfile);
+  extractImage(premultiplyAlpha, ignoreColorSpace);
 }
 
-void WebGLImageConversion::ImageExtractor::extractImage(
-    bool premultiplyAlpha,
-    bool ignoreGammaAndColorProfile) {
+void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha,
+                                                        bool ignoreColorSpace) {
   ASSERT(!m_imagePixelLocker);
 
   if (!m_image)
     return;
 
   sk_sp<SkImage> skiaImage = m_image->imageForCurrentFrame();
   SkImageInfo info = skiaImage ? SkImageInfo::MakeN32Premul(m_image->width(),
                                                             m_image->height())
                                : SkImageInfo::MakeUnknown();
   m_alphaOp = AlphaDoNothing;
   bool hasAlpha = skiaImage ? !skiaImage->isOpaque() : true;
 
-  if ((!skiaImage || ignoreGammaAndColorProfile ||
-       (hasAlpha && !premultiplyAlpha)) &&
+  if ((!skiaImage || ignoreColorSpace || (hasAlpha && !premultiplyAlpha)) &&
       m_image->data()) {
     // Attempt to get raw unpremultiplied image data.
     std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
         m_image->data(), true, ImageDecoder::AlphaNotPremultiplied,
-        ignoreGammaAndColorProfile
-            ? ImageDecoder::GammaAndColorProfileIgnored
-            : ImageDecoder::GammaAndColorProfileApplied));
+        ignoreColorSpace ? ImageDecoder::ColorSpaceIgnored
+                         : ImageDecoder::ColorSpaceApplied));
     if (!decoder || !decoder->frameCount())
       return;
     ImageFrame* frame = decoder->frameBufferAtIndex(0);
     if (!frame || frame->getStatus() != ImageFrame::FrameComplete)
       return;
     hasAlpha = frame->hasAlpha();
     SkBitmap bitmap = frame->bitmap();
     if (!frameIsValid(bitmap))
       return;
 
@@ skipping 360 matching lines @@
       pack<WebGLImageConversion::DataFormatRGB565,
            WebGLImageConversion::AlphaDoNothing>(srcRowStart, dstRowStart,
                                                  pixelsPerRow);
     } break;
     default:
       break;
   }
 }
 
 }  // namespace blink