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

Index: third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp b/third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

index 0eeb5bb14664187b58e582eeb290f1cd9947ccf1..80cd05437f755d98c0880a72e9969a1d04a8fc99 100644

--- a/third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

+++ b/third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

@@ -93,9 +93,9 @@ bool StyleFetchedImageSet::errorOccurred() const

return m_bestFitImage->errorOccurred();

}

-LayoutSize StyleFetchedImageSet::imageSize(const LayoutObject* layoutObject, float multiplier) const

+LayoutSize StyleFetchedImageSet::concreteObjectSize(const LayoutObject* layoutObject, const FloatSize& defaultObjectSize, float multiplier) const

{

- LayoutSize scaledImageSize = m_bestFitImage->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);

+ LayoutSize scaledImageSize = m_bestFitImage->concreteObjectSize(defaultObjectSize, LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);

scaledImageSize.scale(1 / m_imageScaleFactor);

return scaledImageSize;

}