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

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

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

index f2e15b31e4c114262515a4a8c346468200ea4352..1e83dd6a5993efce51db1355ecdf40f53e6156fb 100644

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

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

@@ -91,9 +91,9 @@ bool StyleFetchedImage::errorOccurred() const

return m_image->errorOccurred();

}

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

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

{

- return m_image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);

+ return m_image->concreteObjectSize(defaultObjectSize, LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);

}

bool StyleFetchedImage::imageHasRelativeSize() const