Add ColorBehavior to blink::Image draw methods

third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * 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.
@@ skipping 472 matching lines @@
     }
   }
 
   if (listenerNeedsNewFrameCapture) {
     SourceImageStatus status;
     RefPtr<Image> sourceImage = getSourceImageForCanvas(
         &status, PreferNoAcceleration, SnapshotReasonCanvasListenerCapture,
         FloatSize());
     if (status != NormalSourceImageStatus)
       return;
-    sk_sp<SkImage> image = sourceImage->imageForCurrentFrame();
+    // TODO(ccameron): Canvas should produce sRGB images.
+    // https://crbug.com/672299
+    sk_sp<SkImage> image = sourceImage->imageForCurrentFrame(
+        ColorBehavior::transformToGlobalTarget());
     for (CanvasDrawListener* listener : m_listeners) {
       if (listener->needsNewFrame()) {
         listener->sendNewFrame(image);
       }
     }
   }
 }
 
 void HTMLCanvasElement::paint(GraphicsContext& context, const LayoutRect& r) {
   // FIXME: crbug.com/438240; there is a bug with the new CSS blending and
@@ skipping 109 matching lines @@
   imageData = ImageData::create(m_size);
 
   if ((!m_context || !imageData) && !placeholderFrame())
     return imageData;
 
   DCHECK((m_context && m_context->is2d()) || placeholderFrame());
   sk_sp<SkImage> snapshot;
   if (hasImageBuffer()) {
     snapshot = buffer()->newSkImageSnapshot(PreferNoAcceleration, reason);
   } else if (placeholderFrame()) {
-    snapshot = placeholderFrame()->imageForCurrentFrame();
+    // TODO(ccameron): Canvas should produce sRGB images.
+    // https://crbug.com/672299
+    snapshot = placeholderFrame()->imageForCurrentFrame(
+        ColorBehavior::transformToGlobalTarget());
   }
 
   if (snapshot) {
     SkImageInfo imageInfo = SkImageInfo::Make(
         width(), height(), kRGBA_8888_SkColorType, kUnpremul_SkAlphaType);
     snapshot->readPixels(imageInfo, imageData->data()->data(),
                          imageInfo.minRowBytes(), 0, 0);
   }
 
   return imageData;
@@ skipping 566 matching lines @@
 
   if (!m_context) {
     *status = NormalSourceImageStatus;
     return createTransparentImage(size());
   }
 
   if (m_context->getContextType() == CanvasRenderingContext::ContextImageBitmap)
     return m_context->getImage(hint, reason);
 
   sk_sp<SkImage> skImage;
+  // TODO(ccameron): Canvas should produce sRGB images.
+  // https://crbug.com/672299
   if (m_context->is3d()) {
     // Because WebGL sources always require making a copy of the back buffer, we
     // use paintRenderingResultsToCanvas instead of getImage in order to keep a
     // cached copy of the backing in the canvas's ImageBuffer.
     renderingContext()->paintRenderingResultsToCanvas(BackBuffer);
     skImage = hasImageBuffer()
                   ? buffer()->newSkImageSnapshot(hint, reason)
-                  : createTransparentImage(size())->imageForCurrentFrame();
+                  : createTransparentImage(size())->imageForCurrentFrame(
+                        ColorBehavior::transformToGlobalTarget());
   } else {
     if (ExpensiveCanvasHeuristicParameters::
             DisableAccelerationToAvoidReadbacks &&
         !RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled() &&
         hint == PreferNoAcceleration && m_context->isAccelerated() &&
         hasImageBuffer())
       buffer()->disableAcceleration();
     RefPtr<blink::Image> image = renderingContext()->getImage(hint, reason);
-    skImage = image ? image->imageForCurrentFrame()
-                    : createTransparentImage(size())->imageForCurrentFrame();
+    skImage = image
+                  ? image->imageForCurrentFrame(
+                        ColorBehavior::transformToGlobalTarget())
+                  : createTransparentImage(size())->imageForCurrentFrame(
+                        ColorBehavior::transformToGlobalTarget());
   }
 
   if (skImage) {
     *status = NormalSourceImageStatus;
     return StaticBitmapImage::create(std::move(skImage));
   }
 
   *status = InvalidSourceImageStatus;
   return nullptr;
 }
@@ skipping 131 matching lines @@
   mojom::blink::OffscreenCanvasSurfacePtr service;
   Platform::current()->interfaceProvider()->getInterface(
       mojo::GetProxy(&service));
   m_surfaceLayerBridge =
       wrapUnique(new CanvasSurfaceLayerBridge(std::move(service)));
   return m_surfaceLayerBridge->createSurfaceLayer(this->width(),
                                                   this->height());
 }
 
 }  // namespace blink