third_party/WebKit/Source/core/fetch/ImageResource.cpp - Issue 1653673002: Even more explicit LayoutUnit conversion

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/fetch/ImageResource.cpp

Issue 1653673002: Even more explicit LayoutUnit conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moarConstructors

Patch Set: address comments Created 4 years, 11 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/fetch/ImageResource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp

index c7851237e61ce149a67e32797efea295bf8265f4..1c9b1e124753c34dd1e75130cba65cb152d1be03 100644

--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp

+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp

@@ -228,7 +228,8 @@ LayoutSize ImageResource::imageSize(RespectImageOrientationEnum shouldRespectIma

// Don't let images that have a width/height >= 1 shrink below 1 when zoomed.

float widthScale = m_image->hasRelativeSize() ? 1.0f : multiplier;

float heightScale = m_image->hasRelativeSize() ? 1.0f : multiplier;

- LayoutSize minimumSize(size.width() > 0 ? 1 : 0, size.height() > 0 ? 1 : 0);

+ LayoutSize minimumSize(size.width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),

+ LayoutUnit(size.height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit()));

size.scale(widthScale, heightScale);

size.clampToMinimumSize(minimumSize);

ASSERT(multiplier != 1.0f || (size.width().fraction() == 0.0f && size.height().fraction() == 0.0f));