third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.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/css/resolver/StyleBuilderConverter.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:

View side-by-side diff with in-line comments

Download patch

Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

index b0b3a125e7762ac06e6b80bcdea6b790e6b41df5..b91b8355f1659ed9f294364eaf4e122ac4805580 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -612,7 +612,7 @@ Length StyleBuilderConverter::convertLineHeight(StyleResolverState& state, const

return Length(primitiveValue.getDoubleValue() * 100.0, Percent);

if (primitiveValue.isCalculated()) {

Length zoomedLength = Length(primitiveValue.cssCalcValue()->toCalcValue(lineHeightToLengthConversionData(state)));

- return Length(valueForLength(zoomedLength, state.style()->computedFontSize()), Fixed);

+ return Length(valueForLength(zoomedLength, LayoutUnit(state.style()->computedFontSize())), Fixed);

}

ASSERT(primitiveValue.getValueID() == CSSValueNormal);

« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/dom/Element.cpp » ('j') | no next file with comments »