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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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:

View unified diff | Download patch

« LayoutTests/imported/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute-expected.txt ('K') | « LayoutTests/imported/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org>	2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org>

3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>	3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>

4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>	4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>

5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>	5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>

6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>	6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>

7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.	7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.

8 * Copyright (C) 2010 Google Inc. All rights reserved.	8 * Copyright (C) 2010 Google Inc. All rights reserved.

9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>	9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>

10 *	10 *

(...skipping 82 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 ASSERT(m_layoutObject);	93 ASSERT(m_layoutObject);

94 if (m_cachedImage)	94 if (m_cachedImage)

95 m_cachedImage->setContainerSizeForLayoutObject(m_layoutObject, imageCont ainerSize, m_layoutObject->style()->effectiveZoom());	95 m_cachedImage->setContainerSizeForLayoutObject(m_layoutObject, imageCont ainerSize, m_layoutObject->style()->effectiveZoom());

96 }	96 }

97	97

98 LayoutSize LayoutImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const	98 LayoutSize LayoutImageResource::getImageSize(float multiplier, ImageResource::Si zeType type) const

99 {	99 {

100 if (!m_cachedImage)	100 if (!m_cachedImage)

101 return LayoutSize();	101 return LayoutSize();

102 LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, mu ltiplier, type);	102 LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, mu ltiplier, type);

103 if (m_layoutObject && m_layoutObject->isLayoutImage())	103 if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && siz e.height())

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

105 return size;	105 return size;

106 }	106 }

107	107

108 } // namespace blink	108 } // namespace blink

OLD	NEW