third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp - Issue 1694263003: Add Image::updateConcreteSize()

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/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 1694263003: Add Image::updateConcreteSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor-size-calculation-in

Patch Set: Add some documentation and polish title of test. 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

« third_party/WebKit/Source/core/fetch/ImageResource.h ('K') | « third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.cpp ('k') | third_party/WebKit/Source/platform/graphics/Image.h » ('j') | third_party/WebKit/Source/platform/graphics/Image.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

index fdcfd12a44b4b55eb6ac77b05aa4155e49ea5428..ecb58ef86d6ff9e10daf234b3bf0629acaec1f4a 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

@@ -1267,6 +1267,7 @@ static inline CanvasImageSource* toImageSourceInternal(const CanvasImageSourceUn

void CanvasRenderingContext2D::drawImage(const CanvasImageSourceUnion& imageSource, double x, double y, ExceptionState& exceptionState)

{

CanvasImageSource* imageSourceInternal = toImageSourceInternal(imageSource);

+ imageSourceInternal->updateConcreteObjectSize(FloatSize(canvas()->width(), canvas()->height()));

FloatSize sourceRectSize = imageSourceInternal->elementSize();

FloatSize destRectSize = imageSourceInternal->defaultDestinationSize();

drawImage(imageSourceInternal, 0, 0, sourceRectSize.width(), sourceRectSize.height(), x, y, destRectSize.width(), destRectSize.height(), exceptionState);

@@ -1276,6 +1277,7 @@ void CanvasRenderingContext2D::drawImage(const CanvasImageSourceUnion& imageSour

double x, double y, double width, double height, ExceptionState& exceptionState)

{

CanvasImageSource* imageSourceInternal = toImageSourceInternal(imageSource);

+ imageSourceInternal->updateConcreteObjectSize(FloatSize(canvas()->width(), canvas()->height()));

FloatSize sourceRectSize = imageSourceInternal->elementSize();

drawImage(imageSourceInternal, 0, 0, sourceRectSize.width(), sourceRectSize.height(), x, y, width, height, exceptionState);

}