third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp - Issue 1647313003: Continue converting to explicit LayoutUnit constructors

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/layout/line/RootInlineBox.cpp

Issue 1647313003: Continue converting to explicit LayoutUnit constructors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@explicitContstructors

Patch Set: Add TODO 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:

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

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/layout/line/RootInlineBox.h ('k') | third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp b/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp

index 32e7214321d0b444c432c2a8d34b1185fbba1c22..d87bd1faf0d93441358a3ccd96c0d8b124112f94 100644

--- a/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp

+++ b/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp

@@ -226,7 +226,7 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G

m_hasAnnotationsBefore = hasAnnotationsBefore;

m_hasAnnotationsAfter = hasAnnotationsAfter;

- maxHeight = std::max<LayoutUnit>(0, maxHeight);

+ maxHeight = maxHeight.clampNegativeToZero();

setLineTopBottomPositions(lineTop, lineBottom, heightOfBlock, heightOfBlock + maxHeight, selectionBottom);