third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h - Issue 1756763004: Merge image sizing algorithms

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/LayoutImageResourceStyleImage.h

Issue 1756763004: Merge image sizing algorithms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Extend test to cover svg and non-svg case 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/LayoutBoxModelObject.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutListMarker.cpp » ('j') | third_party/WebKit/Source/core/paint/BoxPainter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 284bb9322ff631adc0ae5ca846a779a588ce89a5..2eefa4633a77239a9d359fe3b05b836591e10b55 100644

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

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

@@ -51,7 +51,13 @@ public:

bool imageHasRelativeSize() const override { return m_styleImage->imageHasRelativeSize(); }

- LayoutSize imageSize(float multiplier) const override { return m_styleImage->imageSize(m_layoutObject, multiplier); }

+ LayoutSize imageSize(float multiplier) const override

+ {

+ // TODO(davve): Find out the default object size, if any, in this context.

+ LayoutSize scaledImageSize = m_styleImage->imageSize(m_layoutObject, multiplier, LayoutSize());

+ scaledImageSize.scale(1 / m_styleImage->imageScaleFactor());

fs 2016/03/03 15:22:53 Won't this double-scale if m_styleImage is an imag

fs 2016/03/03 15:24:43 Ah, no, that code was no longer. You can disregard

+ return scaledImageSize;

+ }

WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }