Add ColorBehavior to blink::Image draw methods

third_party/WebKit/Source/modules/shapedetection/ShapeDetector.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 "modules/shapedetection/ShapeDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/DOMRect.h"
 #include "core/dom/Document.h"
 #include "core/fetch/ImageResource.h"
@@ skipping 113 matching lines @@
     return promise;
   }
 
   Image* const blinkImage = imageResource->getImage();
   if (!blinkImage) {
     resolver->reject(DOMException::create(
         InvalidStateError, "Failed to get image from resource."));
     return promise;
   }
 
-  const sk_sp<SkImage> image = blinkImage->imageForCurrentFrame();
+  // TODO(ccameron): ShapeDetector can ignore color conversion.
+  const sk_sp<SkImage> image = blinkImage->imageForCurrentFrame(
+      ColorBehavior::transformToGlobalTarget());
   DCHECK_EQ(img->naturalWidth(), static_cast<unsigned>(image->width()));
   DCHECK_EQ(img->naturalHeight(), static_cast<unsigned>(image->height()));
 
   if (!image) {
     resolver->reject(DOMException::create(
         InvalidStateError, "Failed to get image from current frame."));
     return promise;
   }
 
   const SkImageInfo skiaInfo =
@@ skipping 72 matching lines @@
     resolver->resolve(HeapVector<Member<DOMRect>>());
     return promise;
   }
 
   SkPixmap pixmap;
   RefPtr<Uint8Array> pixelData;
   uint8_t* pixelDataPtr = nullptr;
   WTF::CheckedNumeric<int> allocationSize = 0;
   // Use |skImage|'s pixels if it has direct access to them, otherwise retrieve
   // them from elsewhere via copyBitmapData().
-  sk_sp<SkImage> skImage = imageBitmap->bitmapImage()->imageForCurrentFrame();
+  // TODO(ccameron): ShapeDetector can ignore color conversion.
+  sk_sp<SkImage> skImage = imageBitmap->bitmapImage()->imageForCurrentFrame(
+      ColorBehavior::transformToGlobalTarget());
   if (skImage->peekPixels(&pixmap)) {
     pixelDataPtr = static_cast<uint8_t*>(pixmap.writable_addr());
     allocationSize = pixmap.getSafeSize();
   } else {
     pixelData = imageBitmap->copyBitmapData(imageBitmap->isPremultiplied()
                                                 ? PremultiplyAlpha
                                                 : DontPremultiplyAlpha,
                                             N32ColorType);
     pixelDataPtr = pixelData->data();
     allocationSize = imageBitmap->size().area() * 4 /* bytes per pixel */;
@@ skipping 28 matching lines @@
       video->getSourceImageForCanvas(&sourceImageStatus, PreferNoAcceleration,
                                      SnapshotReasonDrawImage, videoSize);
 
   DCHECK_EQ(NormalSourceImageStatus, sourceImageStatus);
 
   SkPixmap pixmap;
   RefPtr<Uint8Array> pixelData;
   uint8_t* pixelDataPtr = nullptr;
   WTF::CheckedNumeric<int> allocationSize = 0;
   // Use |skImage|'s pixels if it has direct access to them.
-  sk_sp<SkImage> skImage = image->imageForCurrentFrame();
+  // TODO(ccameron): ShapeDetector can ignore color conversion.
+  sk_sp<SkImage> skImage =
+      image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
   if (skImage->peekPixels(&pixmap)) {
     pixelDataPtr = static_cast<uint8_t*>(pixmap.writable_addr());
     allocationSize = pixmap.getSafeSize();
   } else {
     // TODO(mcasas): retrieve the pixels from elsewhere.
     NOTREACHED();
     resolver->reject(DOMException::create(
         InvalidStateError, "Failed to get pixels for current frame."));
     return promise;
   }
@@ skipping 109 matching lines @@
   m_barcodeServiceRequests.clear();
   m_barcodeService.reset();
 }
 
 DEFINE_TRACE(ShapeDetector) {
   visitor->trace(m_faceServiceRequests);
   visitor->trace(m_barcodeServiceRequests);
 }
 
 }  // namespace blink