third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp - Issue 1468023002: Rename imageSizeForLayoutObject() to imageSize()

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 1468023002: Rename imageSizeForLayoutObject() to imageSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Actually return value too Created 5 years, 1 month 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/style/StyleFetchedImage.cpp ('K') | « third_party/WebKit/Source/core/style/StyleFetchedImage.cpp ('k') | third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp » ('j') | third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp » ('J')
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 b1e26010130c66b87ba8937927611286a771f301..c686978e8e93eaa9d0dc549cf8f5292a73ebe68d 100644

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

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

@@ -86,7 +86,8 @@ bool StyleFetchedImageSet::errorOccurred() const

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

{

- LayoutSize scaledImageSize = m_bestFitImage->imageSizeForLayoutObject(layoutObject, multiplier);

+ RespectImageOrientationEnum shouldRespectImageOrientation = layoutObject ? layoutObject->shouldRespectImageOrientation() : DoNotRespectImageOrientation;

+ LayoutSize scaledImageSize = m_bestFitImage->imageSize(shouldRespectImageOrientation, multiplier);

Yoav Weiss 2015/11/24 10:29:07 and here as well :)

davve 2015/11/24 12:49:13 If I had such a function, yes. (again)

scaledImageSize.scale(1 / m_imageScaleFactor);

return scaledImageSize;

}