Add ColorBehavior to blink::Image draw methods

third_party/WebKit/Source/core/frame/ImageBitmap.cpp

 // Copyright 2013 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 "core/frame/ImageBitmap.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "platform/graphics/skia/SkiaUtils.h"
@@ skipping 282 matching lines @@
         info.bytesPerPixel());
     if (!dstBuffer)
       return nullptr;
     RefPtr<Uint8Array> dstPixels =
         Uint8Array::create(dstBuffer, 0, dstBuffer->byteLength());
     return StaticBitmapImage::create(newSkImageFromRaster(
         info, std::move(dstPixels),
         static_cast<unsigned>(info.width()) * info.bytesPerPixel()));
   }
 
-  sk_sp<SkImage> skiaImage = image->imageForCurrentFrame();
+  // TODO(ccameron): Canvas should operate in sRGB and not display space.
+  // https://crbug.com/667431
+  sk_sp<SkImage> skiaImage =
+      image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
   // Attempt to get raw unpremultiplied image data, executed only when skiaImage
   // is premultiplied.
   if ((((!parsedOptions.premultiplyAlpha && !skiaImage->isOpaque()) ||
         !skiaImage) &&
        image->data() && imageFormat == PremultiplyAlpha) ||
       colorBehavior.isIgnore()) {
     std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
         image->data(), true,
         parsedOptions.premultiplyAlpha ? ImageDecoder::AlphaPremultiplied
                                        : ImageDecoder::AlphaNotPremultiplied,
@@ skipping 77 matching lines @@
     m_image = cropImage(input.get(), parsedOptions, PremultiplyAlpha,
                         ColorBehavior::ignore());
   } else {
     m_image = cropImage(input.get(), parsedOptions, PremultiplyAlpha,
                         ColorBehavior::transformToGlobalTarget());
   }
   if (!m_image)
     return;
   // In the case where the source image is lazy-decoded, m_image may not be in
   // a decoded state, we trigger it here.
-  sk_sp<SkImage> skImage = m_image->imageForCurrentFrame();
+  // TODO(ccameron): Canvas should operate in sRGB and not display space.
+  // https://crbug.com/667431
+  sk_sp<SkImage> skImage =
+      m_image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
   SkPixmap pixmap;
   if (!skImage->isTextureBacked() && !skImage->peekPixels(&pixmap)) {
     sk_sp<SkSurface> surface =
         SkSurface::MakeRasterN32Premul(skImage->width(), skImage->height());
     surface->getCanvas()->drawImage(skImage, 0, 0);
     m_image = StaticBitmapImage::create(surface->makeImageSnapshot());
   }
   if (!m_image)
     return;
   m_image->setOriginClean(
@@ skipping 70 matching lines @@
   if (!parsedOptions.premultiplyAlpha) {
     parsedOptions.premultiplyAlpha = true;
     isPremultiplyAlphaReverted = true;
   }
   m_image = cropImage(input.get(), parsedOptions, PremultiplyAlpha,
                       ColorBehavior::transformToGlobalTarget());
   if (!m_image)
     return;
   if (isPremultiplyAlphaReverted) {
     parsedOptions.premultiplyAlpha = false;
-    m_image = StaticBitmapImage::create(
-        premulSkImageToUnPremul(m_image->imageForCurrentFrame().get()));
+    // TODO(ccameron): Canvas should operate in sRGB and not display space.
+    // https://crbug.com/667431
+    m_image = StaticBitmapImage::create(premulSkImageToUnPremul(
+        m_image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())
+            .get()));
   }
   if (!m_image)
     return;
   m_image->setOriginClean(canvas->originClean());
   m_image->setPremultiplied(parsedOptions.premultiplyAlpha);
 }
 
 ImageBitmap::ImageBitmap(const void* pixelData,
                          uint32_t width,
                          uint32_t height,
@@ skipping 295 matching lines @@
   return ImageBitmap::create(StaticBitmapImage::create(std::move(image)));
 }
 
 PassRefPtr<Uint8Array> ImageBitmap::copyBitmapData(AlphaDisposition alphaOp,
                                                    DataColorFormat format) {
   SkImageInfo info = SkImageInfo::Make(
       width(), height(),
       (format == RGBAColorType) ? kRGBA_8888_SkColorType : kN32_SkColorType,
       (alphaOp == PremultiplyAlpha) ? kPremul_SkAlphaType
                                     : kUnpremul_SkAlphaType);
-  RefPtr<Uint8Array> dstPixels =
-      copySkImageData(m_image->imageForCurrentFrame().get(), info);
+  // TODO(ccameron): Canvas should operate in sRGB and not display space.
+  // https://crbug.com/667431
+  RefPtr<Uint8Array> dstPixels = copySkImageData(
+      m_image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())
+          .get(),
+      info);
   return dstPixels.release();
 }
 
 unsigned long ImageBitmap::width() const {
   if (!m_image)
     return 0;
   ASSERT(m_image->width() > 0);
   return m_image->width();
 }
 
@@ skipping 43 matching lines @@
 void ImageBitmap::adjustDrawRects(FloatRect* srcRect,
                                   FloatRect* dstRect) const {}
 
 FloatSize ImageBitmap::elementSize(const FloatSize&) const {
   return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap) {}
 
 }  // namespace blink