third_party/WebKit/Source/core/style/StyleGeneratedImage.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/style/StyleGeneratedImage.h

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

Patch Set: Fix unused variable 'styleImage' in release Created 4 years, 9 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:

Index: third_party/WebKit/Source/core/style/StyleGeneratedImage.h

diff --git a/third_party/WebKit/Source/core/style/StyleGeneratedImage.h b/third_party/WebKit/Source/core/style/StyleGeneratedImage.h

index 17a4cddb898e437dcfff86a155a815a4d16c8a12..2b94f788e1de3ef8e22db4eb627e79f482e1eaaa 100644

--- a/third_party/WebKit/Source/core/style/StyleGeneratedImage.h

+++ b/third_party/WebKit/Source/core/style/StyleGeneratedImage.h

@@ -44,7 +44,7 @@ public:

PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;

PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;

- LayoutSize imageSize(const LayoutObject*, float multiplier) const override;

+ LayoutSize imageSize(const LayoutObject*, float multiplier, const LayoutSize& defaultObjectSize) const override;

bool imageHasRelativeSize() const override { return !m_fixedSize; }

void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSize, FloatSize& intrinsicRatio) override;

bool usesImageContainerSize() const override { return !m_fixedSize; }