Add ColorBehavior to blink::Image draw methods

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

 /*
  * Copyright (C) 2011 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 23 matching lines @@
                                                  PassRefPtr<Image> toImage,
                                                  float percentage,
                                                  IntSize crossfadeSize,
                                                  const IntSize& size)
     : GeneratedImage(size),
       m_fromImage(fromImage),
       m_toImage(toImage),
       m_percentage(percentage),
       m_crossfadeSize(crossfadeSize) {}
 
-void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas,
-                                            const SkPaint& paint,
-                                            ImageClampingMode clampMode) {
+void CrossfadeGeneratedImage::drawCrossfade(
+    SkCanvas* canvas,
+    const SkPaint& paint,
+    ImageClampingMode clampMode,
+    const ColorBehavior& colorBehavior) {
   FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size()));
   FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size()));
   FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize));
 
   // TODO(junov): The various effects encoded into paint should probably be
   // applied here instead of inside the layer.  This probably faulty behavior
   // was maintained in order to preserve pre-existing behavior while refactoring
   // this code.  This should be investigated further. crbug.com/472634
   SkPaint layerPaint;
   layerPaint.setBlendMode(paint.getBlendMode());
   SkAutoCanvasRestore ar(canvas, false);
   canvas->saveLayer(nullptr, &layerPaint);
 
   SkPaint imagePaint(paint);
   imagePaint.setBlendMode(SkBlendMode::kSrcOver);
   int imageAlpha = clampedAlphaForBlending(1 - m_percentage);
   imagePaint.setAlpha(imageAlpha > 255 ? 255 : imageAlpha);
   imagePaint.setAntiAlias(paint.isAntiAlias());
   // TODO(junov): This code should probably be propagating the
   // RespectImageOrientationEnum from CrossfadeGeneratedImage::draw(). Code was
   // written this way during refactoring to avoid modifying existing behavior,
   // but this warrants further investigation. crbug.com/472634
   m_fromImage->draw(canvas, imagePaint, destRect, fromImageRect,
-                    DoNotRespectImageOrientation, clampMode);
+                    DoNotRespectImageOrientation, clampMode, colorBehavior);
   imagePaint.setBlendMode(SkBlendMode::kPlus);
   imageAlpha = clampedAlphaForBlending(m_percentage);
   imagePaint.setAlpha(imageAlpha > 255 ? 255 : imageAlpha);
   m_toImage->draw(canvas, imagePaint, destRect, toImageRect,
-                  DoNotRespectImageOrientation, clampMode);
+                  DoNotRespectImageOrientation, clampMode, colorBehavior);
 }
 
 void CrossfadeGeneratedImage::draw(SkCanvas* canvas,
                                    const SkPaint& paint,
                                    const FloatRect& dstRect,
                                    const FloatRect& srcRect,
                                    RespectImageOrientationEnum,
-                                   ImageClampingMode clampMode) {
+                                   ImageClampingMode clampMode,
+                                   const ColorBehavior& colorBehavior) {
   // Draw nothing if either of the images hasn't loaded yet.
   if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage())
     return;
 
   SkAutoCanvasRestore ar(canvas, true);
   canvas->clipRect(dstRect);
   canvas->translate(dstRect.x(), dstRect.y());
   if (dstRect.size() != srcRect.size())
     canvas->scale(dstRect.width() / srcRect.width(),
                   dstRect.height() / srcRect.height());
   canvas->translate(-srcRect.x(), -srcRect.y());
 
-  drawCrossfade(canvas, paint, clampMode);
+  drawCrossfade(canvas, paint, clampMode, colorBehavior);
 }
 
 void CrossfadeGeneratedImage::drawTile(GraphicsContext& context,
                                        const FloatRect& srcRect) {
   // Draw nothing if either of the images hasn't loaded yet.
   if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage())
     return;
 
   SkPaint paint = context.fillPaint();
   paint.setBlendMode(SkBlendMode::kSrcOver);
   paint.setAntiAlias(context.shouldAntialias());
   FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize));
   paint.setFilterQuality(context.computeFilterQuality(this, destRect, srcRect));
-  drawCrossfade(context.canvas(), paint, ClampImageToSourceRect);
+  drawCrossfade(context.canvas(), paint, ClampImageToSourceRect,
+                context.getColorBehavior());
 }
 
 }  // namespace blink