Add ColorBehavior to blink::Image draw methods

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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
@@ skipping 237 matching lines @@
 
 void Image::drawPattern(GraphicsContext& context,
                         const FloatRect& floatSrcRect,
                         const FloatSize& scale,
                         const FloatPoint& phase,
                         SkBlendMode compositeOp,
                         const FloatRect& destRect,
                         const FloatSize& repeatSpacing) {
   TRACE_EVENT0("skia", "Image::drawPattern");
 
-  sk_sp<SkImage> image = imageForCurrentFrame();
+  sk_sp<SkImage> image = imageForCurrentFrame(context.getColorBehavior());
   if (!image)
     return;
 
   FloatRect normSrcRect = floatSrcRect;
 
   normSrcRect.intersect(FloatRect(0, 0, image->width(), image->height()));
   if (destRect.isEmpty() || normSrcRect.isEmpty())
     return;  // nothing to draw
 
   SkMatrix localMatrix;
@@ skipping 35 matching lines @@
     PlatformInstrumentation::didDrawLazyPixelRef(imageID);
 }
 
 PassRefPtr<Image> Image::imageForDefaultFrame() {
   RefPtr<Image> image(this);
 
   return image.release();
 }
 
 bool Image::isTextureBacked() {
-  sk_sp<SkImage> image = imageForCurrentFrame();
+  // TODO(ccameron): It should not be necessary to specify color conversion for
+  // this query.
+  sk_sp<SkImage> image =
+      imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
   return image ? image->isTextureBacked() : false;
 }
 
-bool Image::applyShader(SkPaint& paint, const SkMatrix& localMatrix) {
+bool Image::applyShader(SkPaint& paint,
+                        const SkMatrix& localMatrix,
+                        const ColorBehavior& colorBehavior) {
   // Default shader impl: attempt to build a shader based on the current frame
   // SkImage.
-  sk_sp<SkImage> image = imageForCurrentFrame();
+  sk_sp<SkImage> image = imageForCurrentFrame(colorBehavior);
   if (!image)
     return false;
 
   paint.setShader(image->makeShader(SkShader::kRepeat_TileMode,
                                     SkShader::kRepeat_TileMode, &localMatrix));
 
   // Animation is normally refreshed in draw() impls, which we don't call when
   // painting via shaders.
   startAnimation();
 
@@ skipping 27 matching lines @@
   FloatRect subset = dest;
   subset.setX((dest.x() - tile.x()) / scale.width());
   subset.setY((dest.y() - tile.y()) / scale.height());
   subset.setWidth(dest.width() / scale.width());
   subset.setHeight(dest.height() / scale.height());
 
   return subset;
 }
 
 }  // namespace blink