third_party/WebKit/Source/core/html/HTMLImageElement.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/core/html/HTMLImageElement.cpp

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

Patch Set: Pull test for now, needs changes in upcoming CL to pass. Address nits. 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/core/html/HTMLImageElement.h ('k') | third_party/WebKit/Source/core/html/canvas/CanvasImageSource.h » ('j') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLImageElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

index ae623aa5b06f2528997fc5596fae464094d7f11b..c8c3a2516b57049e84c0c5cd450e6f2c49ccc5a3 100644

--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

@@ -640,6 +640,15 @@ bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi

return !image->isAccessAllowed(destinationSecurityOrigin);

}

+void HTMLImageElement::updateConcreteObjectSize(const FloatSize& defaultObjectSize)

+ ImageResource* image = cachedImage();

+ if (!image)

+ return;

+ return image->updateConcreteObjectSize(LayoutSize(defaultObjectSize));

FloatSize HTMLImageElement::elementSize() const

{

ImageResource* image = cachedImage();