third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp - 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/css/CSSImageGeneratorValue.cpp

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/css/CSSImageGeneratorValue.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp

index df434dd77a7819b2ec364544794f21268932defe..e1bf09753bb5211f6cd4c653fe7f8149ecf99acc 100644

--- a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp

+++ b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp

@@ -155,11 +155,11 @@ bool CSSImageGeneratorValue::isFixedSize() const

return false;

}

-IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject)

+IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject, const FloatSize& defaultObjectSize)

{

switch (getClassType()) {

case CrossfadeClass:

- return toCSSCrossfadeValue(this)->fixedSize(layoutObject);

+ return toCSSCrossfadeValue(this)->fixedSize(layoutObject, defaultObjectSize);

case LinearGradientClass:

return toCSSLinearGradientValue(this)->fixedSize(layoutObject);

case RadialGradientClass: