| Index: Source/platform/graphics/CrossfadeGeneratedImage.cpp
|
| diff --git a/Source/platform/graphics/CrossfadeGeneratedImage.cpp b/Source/platform/graphics/CrossfadeGeneratedImage.cpp
|
| index 4aea53c60a521ca6789ee2754965d4a54baae73d..10885faec05b0e647b722507d1851f0908bc0b0b 100644
|
| --- a/Source/platform/graphics/CrossfadeGeneratedImage.cpp
|
| +++ b/Source/platform/graphics/CrossfadeGeneratedImage.cpp
|
| @@ -28,6 +28,7 @@
|
|
|
| #include "platform/geometry/FloatRect.h"
|
| #include "platform/graphics/GraphicsContext.h"
|
| +#include "platform/weborigin/KURL.h"
|
|
|
| namespace blink {
|
|
|
| @@ -63,14 +64,14 @@ void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas, const SkPaint& pai
|
| // TODO(junov): This code should probably be propagating the RespectImageOrientationEnum
|
| // form 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);
|
| + m_fromImage->draw(canvas, imagePaint, destRect, fromImageRect, DoNotRespectImageOrientation, clampMode, KURL()); // TODO(davve): empty url
|
| imagePaint.setXfermodeMode(SkXfermode::kPlus_Mode);
|
| imageAlpha = clampedAlphaForBlending(m_percentage);
|
| imagePaint.setAlpha(imageAlpha > 255 ? 255 : imageAlpha);
|
| - m_toImage->draw(canvas, imagePaint, destRect, toImageRect, DoNotRespectImageOrientation, clampMode);
|
| + m_toImage->draw(canvas, imagePaint, destRect, toImageRect, DoNotRespectImageOrientation, clampMode, KURL()); // TODO(davve): empty url
|
| }
|
|
|
| -void CrossfadeGeneratedImage::draw(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, ImageClampingMode clampMode)
|
| +void CrossfadeGeneratedImage::draw(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, ImageClampingMode clampMode, const KURL&)
|
| {
|
| // Draw nothing if either of the images hasn't loaded yet.
|
| if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage())
|
|
|