Add ColorBehavior to blink::Image draw methods

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 755 matching lines @@
     NOTREACHED();
     return nullptr;
   }
   return buffer->newImageSnapshot(hint, reason);
 }
 
 ImageData* WebGLRenderingContextBase::toImageData(SnapshotReason reason) const {
   // TODO: Furnish toImageData in webgl renderingcontext for jpeg and webp
   // images. See crbug.com/657531.
   ImageData* imageData = nullptr;
+  // TODO(ccameron): WebGL should produce sRGB images.
+  // https://crbug.com/672299
   if (this->drawingBuffer()) {
-    sk_sp<SkImage> snapshot = this->drawingBuffer()
-                                  ->transferToStaticBitmapImage()
-                                  ->imageForCurrentFrame();
+    sk_sp<SkImage> snapshot =
+        this->drawingBuffer()
+            ->transferToStaticBitmapImage()
+            ->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
     if (snapshot) {
       imageData = ImageData::create(this->getOffscreenCanvas()->size());
       SkImageInfo imageInfo = SkImageInfo::Make(
           this->drawingBufferWidth(), this->drawingBufferHeight(),
           kRGBA_8888_SkColorType, kUnpremul_SkAlphaType);
       snapshot->readPixels(imageInfo, imageData->data()->data(),
                            imageInfo.minRowBytes(), 0, 0);
     }
   }
   return imageData;
@@ skipping 3730 matching lines @@
     synthesizeGLError(GL_OUT_OF_MEMORY, functionName, "out of memory");
     return nullptr;
   }
 
   if (!image->currentFrameKnownToBeOpaque())
     buf->canvas()->clear(SK_ColorTRANSPARENT);
 
   IntRect srcRect(IntPoint(), image->size());
   IntRect destRect(0, 0, size.width(), size.height());
   SkPaint paint;
+  // TODO(ccameron): WebGL should produce sRGB images.
+  // https://crbug.com/672299
   image->draw(buf->canvas(), paint, destRect, srcRect,
-              DoNotRespectImageOrientation, Image::DoNotClampImageToSourceRect);
+              DoNotRespectImageOrientation, Image::DoNotClampImageToSourceRect,
+              ColorBehavior::transformToGlobalTarget());
   return buf->newImageSnapshot(PreferNoAcceleration,
                                SnapshotReasonWebGLDrawImageIntoBuffer);
 }
 
 WebGLTexture* WebGLRenderingContextBase::validateTexImageBinding(
     const char* funcName,
     TexImageFunctionID functionID,
     GLenum target) {
   return validateTexture2DBinding(funcName, target);
 }
@@ skipping 743 matching lines @@
       texImage2DBase(target, level, internalformat, width, height, 0, format,
                      type, 0);
       texImageByGPU(TexImage2DByGPU, texture, target, level, internalformat,
                     type, 0, 0, 0, bitmap, sourceSubRect);
     } else if (functionID == TexSubImage2D) {
       texImageByGPU(TexSubImage2DByGPU, texture, target, level, GL_RGBA, type,
                     xoffset, yoffset, 0, bitmap, sourceSubRect);
     }
     return;
   }
-  sk_sp<SkImage> skImage = bitmap->bitmapImage()->imageForCurrentFrame();
+  // TODO(ccameron): WebGL should produce sRGB images.
+  // https://crbug.com/672299
+  sk_sp<SkImage> skImage = bitmap->bitmapImage()->imageForCurrentFrame(
+      ColorBehavior::transformToGlobalTarget());
   SkPixmap pixmap;
   uint8_t* pixelDataPtr = nullptr;
   RefPtr<Uint8Array> pixelData;
   // In the case where an ImageBitmap is not texture backed, peekPixels() always
   // succeed.  However, when it is texture backed and !canUseTexImageByGPU, we
   // do a GPU read back.
   bool peekSucceed = skImage->peekPixels(&pixmap);
   if (peekSucceed) {
     pixelDataPtr = static_cast<uint8_t*>(pixmap.writable_addr());
   } else {
@@ skipping 2435 matching lines @@
 
 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(
     HTMLCanvasElementOrOffscreenCanvas& result) const {
   if (canvas())
     result.setHTMLCanvasElement(canvas());
   else
     result.setOffscreenCanvas(getOffscreenCanvas());
 }
 
 }  // namespace blink