third_party/WebKit/Source/core/paint/BoxPainter.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/paint/BoxPainter.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/paint/BoxPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/BoxPainter.cpp b/third_party/WebKit/Source/core/paint/BoxPainter.cpp

index 94500cd32791286854d2637b0012c55a70e1026d..d1d135e1fe64a9a7f238f47947e8341b4cb16388 100644

--- a/third_party/WebKit/Source/core/paint/BoxPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/BoxPainter.cpp

@@ -136,9 +136,11 @@ void BoxPainter::paintBackground(const PaintInfo& paintInfo, const LayoutRect& p

bool BoxPainter::isFillLayerOpaque(const FillLayer& layer, const LayoutObject& imageClient)

{

+ // The default object size passed down to imageSize is empty with the implication that images

+ // with no intrinsic size are treated as empty.

return layer.hasOpaqueImage(&imageClient)

&& layer.image()->canRender()

- && !layer.image()->imageSize(&imageClient, imageClient.style()->effectiveZoom()).isEmpty()

+ && !layer.image()->imageSize(&imageClient, imageClient.style()->effectiveZoom(), LayoutSize()).isEmpty()

&& layer.hasRepeatXY();

}