Source/core/layout/LayoutImageResource.cpp - Issue 1299493005: Avoid scaling a zero-sized image

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: Source/core/layout/LayoutImageResource.cpp

Issue 1299493005: Avoid scaling a zero-sized image (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: rebase Created 5 years, 4 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: Source/core/layout/LayoutImageResource.cpp

diff --git a/Source/core/layout/LayoutImageResource.cpp b/Source/core/layout/LayoutImageResource.cpp

index 8f55ceb1071273514693ebfb7c654b645a9a5824..85e24d61d56493228c2276e38b94076d114c9807 100644

--- a/Source/core/layout/LayoutImageResource.cpp

+++ b/Source/core/layout/LayoutImageResource.cpp

@@ -100,7 +100,7 @@ LayoutSize LayoutImageResource::getImageSize(float multiplier, ImageResource::Si

if (!m_cachedImage)

return LayoutSize();

LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, multiplier, type);

- if (m_layoutObject && m_layoutObject->isLayoutImage())

+ if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && size.height())

size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio());

return size;

}