third_party/WebKit/Source/core/style/ComputedStyle.cpp - Issue 1660863002: Force all LayoutUnit construction to be explicit

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/style/ComputedStyle.cpp

Issue 1660863002: Force all LayoutUnit construction to be explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Also fix LayoutRectTest.cpp Created 4 years, 10 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/style/ComputedStyle.cpp

diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp

index e51ccac6482ac12b479821aebca9bbcf9e7c7986..7bc15c02f34a989f731f2d5dba7c34005c4ee6d9 100644

--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp

+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp

@@ -1381,7 +1381,7 @@ int ComputedStyle::computedLineHeight() const

return fontMetrics().lineSpacing();

if (lh.hasPercent())

- return minimumValueForLength(lh, computedFontSize());

+ return minimumValueForLength(lh, LayoutUnit(computedFontSize()));

return std::min(lh.value(), LayoutUnit::max().toFloat());

}