third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp - Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 | « third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.h ('k') | third_party/WebKit/Source/platform/graphics/GeneratedImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp

index e145c23f18124452ec36d4615212afae0658348f..cddeb5e367b912f637b25c72501e272c766d043f 100644

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

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

@@ -41,8 +41,8 @@ CrossfadeGeneratedImage::CrossfadeGeneratedImage(PassRefPtr<Image> fromImage, Pa

void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas, const SkPaint& paint, ImageClampingMode clampMode)

{

- FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size()));

- FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size()));

+ FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->defaultConcreteObjectSize()));

+ FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->defaultConcreteObjectSize()));

FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize));

// TODO(junov): The various effects encoded into paint should probably be applied here