Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1525)

Unified Diff: Source/platform/graphics/CrossfadeGeneratedImage.cpp

Issue 1334703002: NOT FOR LANDING Pass URL to Image::draw (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/graphics/CrossfadeGeneratedImage.h ('k') | Source/platform/graphics/GeneratedImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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())
« no previous file with comments | « Source/platform/graphics/CrossfadeGeneratedImage.h ('k') | Source/platform/graphics/GeneratedImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698