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 91 matching lines @@
     resolver->reject(
         DOMException::create(InvalidStateError, "Invalid element or state."));
     return promise;
   }
 
   SkPixmap pixmap;
   RefPtr<Uint8Array> pixelData;
   uint8_t* pixelDataPtr = nullptr;
   WTF::CheckedNumeric<int> allocationSize = 0;
 
-  sk_sp<SkImage> skImage = image->imageForCurrentFrame();
+  // TODO(ccameron): ShapeDetector can ignore color conversion.
+  sk_sp<SkImage> skImage =
+      image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
   // Use |skImage|'s pixels if it has direct access to them.
   if (skImage->peekPixels(&pixmap)) {
     pixelDataPtr = static_cast<uint8_t*>(pixmap.writable_addr());
     allocationSize = pixmap.getSafeSize();
   } else if (imageSource.isImageBitmap()) {
     ImageBitmap* imageBitmap = imageSource.getAsImageBitmap();
     pixelData = imageBitmap->copyBitmapData(imageBitmap->isPremultiplied()
                                                 ? PremultiplyAlpha
                                                 : DontPremultiplyAlpha,
                                             N32ColorType);
@@ skipping 33 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 23 matching lines @@
         InvalidStateError,
         "Failed to read pixels: Unable to decompress or unsupported format."));
     return promise;
   }
 
   return doDetect(resolver, std::move(sharedBufferHandle), img->naturalWidth(),
                   img->naturalHeight());
 }
 
 }  // namespace blink