third_party/WebKit/Source/core/layout/LayoutImageResource.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/core/layout/LayoutImageResource.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/core/layout/LayoutImageResource.h ('k') | third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp b/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

index 2037457c0a490c306a79a6ebe58b2aab9ecdfe20..e26191e2958513d1d9fbc2fd94633cd2347093cb 100644

--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

@@ -89,11 +89,11 @@ void LayoutImageResource::resetAnimation()

m_layoutObject->setShouldDoFullPaintInvalidation();

}

-LayoutSize LayoutImageResource::imageSize(float multiplier) const

+LayoutSize LayoutImageResource::concreteObjectSize(const FloatSize& defaultObjectSize, float multiplier) const

{

if (!m_cachedImage)

return LayoutSize();

- LayoutSize size = m_cachedImage->imageSize(LayoutObject::shouldRespectImageOrientation(m_layoutObject), multiplier);

+ LayoutSize size = m_cachedImage->concreteObjectSize(defaultObjectSize, LayoutObject::shouldRespectImageOrientation(m_layoutObject), multiplier);

if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && size.height())

size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio());

return size;