Add ColorBehavior to blink::Image draw methods

third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp

 // Copyright 2016 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/OffscreenCanvasFrameDispatcherImpl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "platform/CrossThreadFunctional.h"
@@ skipping 52 matching lines @@
   if (!bitmap)
     return;
   unsigned char* pixels = bitmap->pixels();
   DCHECK(pixels);
   SkImageInfo imageInfo = SkImageInfo::Make(
       m_width, m_height, kN32_SkColorType,
       image->isPremultiplied() ? kPremul_SkAlphaType : kUnpremul_SkAlphaType);
   // TODO(xlai): Optimize to avoid copying pixels. See crbug.com/651456.
   // However, in the case when |image| is texture backed, this function call
   // does a GPU readback which is required.
-  image->imageForCurrentFrame()->readPixels(imageInfo, pixels,
-                                            imageInfo.minRowBytes(), 0, 0);
+  // TODO(ccameron): Canvas should produce sRGB images.
+  // https://crbug.com/672299
+  image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())
+      ->readPixels(imageInfo, pixels, imageInfo.minRowBytes(), 0, 0);
   resource.mailbox_holder.mailbox = bitmap->id();
   resource.mailbox_holder.texture_target = 0;
   resource.is_software = true;
 
   // Hold ref to |bitmap|, to keep it alive until the browser ReclaimResources.
   // It guarantees that the shared bitmap is not re-used or deleted.
   m_sharedBitmaps.add(m_nextResourceId, std::move(bitmap));
 }
 
 void OffscreenCanvasFrameDispatcherImpl::
@@ skipping 13 matching lines @@
   SkImageInfo info = SkImageInfo::Make(
       m_width, m_height, kN32_SkColorType,
       image->isPremultiplied() ? kPremul_SkAlphaType : kUnpremul_SkAlphaType);
   RefPtr<ArrayBuffer> dstBuffer =
       ArrayBuffer::createOrNull(m_width * m_height, info.bytesPerPixel());
   // If it fails to create a buffer for copying the pixel data, then exit early.
   if (!dstBuffer)
     return;
   RefPtr<Uint8Array> dstPixels =
       Uint8Array::create(dstBuffer, 0, dstBuffer->byteLength());
-  image->imageForCurrentFrame()->readPixels(info, dstPixels->data(),
-                                            info.minRowBytes(), 0, 0);
+  // TODO(ccameron): Canvas should produce sRGB images.
+  // https://crbug.com/672299
+  image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())
+      ->readPixels(info, dstPixels->data(), info.minRowBytes(), 0, 0);
 
   GLuint textureId = 0u;
   gl->GenTextures(1, &textureId);
   gl->BindTexture(GL_TEXTURE_2D, textureId);
   GLenum format =
       (kN32_SkColorType == kRGBA_8888_SkColorType) ? GL_RGBA : GL_BGRA_EXT;
   gl->TexImage2D(GL_TEXTURE_2D, 0, format, m_width, m_height, 0, format,
                  GL_UNSIGNED_BYTE, 0);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ skipping 285 matching lines @@
     return true;
   return false;
 }
 
 void OffscreenCanvasFrameDispatcherImpl::reshape(int width, int height) {
   m_width = width;
   m_height = height;
 }
 
 }  // namespace blink