third_party/WebKit/Source/core/layout/line/InlineBox.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/InlineBox.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/BreakingContextInlineHeaders.h ('k') | third_party/WebKit/Source/core/layout/line/LineInfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fceffdfd42f60992b4c009c0ef6e49f2ee05ca4d..d07c203204359f08a871b8f826515b7569cea595 100644

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

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

@@ -150,7 +150,7 @@ LayoutUnit InlineBox::logicalHeight() const

ASSERT(isInlineFlowBox());

LineLayoutBoxModel flowObject = boxModelObject();

const FontMetrics& fontMetrics = lineLayoutItem().style(isFirstLineStyle())->fontMetrics();

- LayoutUnit result = fontMetrics.height();

+ LayoutUnit result(fontMetrics.height());

if (parent())

result += flowObject.borderAndPaddingLogicalHeight();

return result;

@@ -320,7 +320,7 @@ LayoutUnit InlineBox::placeEllipsisBox(bool, LayoutUnit, LayoutUnit, LayoutUnit,

{

// Use -1 to mean "we didn't set the position."

truncatedWidth += logicalWidth();

- return -1;

+ return LayoutUnit(-1);

}

void InlineBox::clearKnownToHaveNoOverflow()