third_party/WebKit/Source/core/layout/LayoutImageResource.h - 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.h

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

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

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

index 9680c5aa5365e2a7270f976abffa39fd293b94ad..3c2b8da0fe802ee218bdb110a68704930a8cdc74 100644

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

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

@@ -59,7 +59,11 @@ public:

virtual bool imageHasRelativeSize() const { return m_cachedImage ? m_cachedImage->imageHasRelativeSize() : false; }

- virtual LayoutSize imageSize(float multiplier) const;

+ virtual LayoutSize concreteObjectSize(const FloatSize& defaultObjectSize, float multiplier) const;

+ LayoutSize defaultConcreteObjectSize(float multiplier) const

+ {

+ return concreteObjectSize(FloatSize(300, 150), multiplier);

+ }

virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }