third_party/WebKit/Source/core/layout/line/InlineFlowBox.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/layout/line/InlineFlowBox.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:

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

Download patch

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

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

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

index aa91d18d36577b9c44c3d6140016da8fa9d75c25..c0c4c09db16098015e492eeaef054b0b33c2eab3 100644

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

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

@@ -588,7 +588,7 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit top, LayoutUnit maxHei

setLogicalTop(roundToInt(top + maxAscent - fontMetrics.ascent(baselineType)));

}

- LayoutUnit adjustmentForChildrenWithSameLineHeightAndBaseline = 0;

+ LayoutUnit adjustmentForChildrenWithSameLineHeightAndBaseline;

if (descendantsHaveSameLineHeightAndBaseline()) {

adjustmentForChildrenWithSameLineHeightAndBaseline = logicalTop();

if (parent())

@@ -622,7 +622,7 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit top, LayoutUnit maxHei

LayoutUnit newLogicalTopIncludingMargins = newLogicalTop;

LayoutUnit boxHeight = curr->logicalHeight();

LayoutUnit boxHeightIncludingMargins = boxHeight;

- LayoutUnit borderPaddingHeight = 0;

+ LayoutUnit borderPaddingHeight;

if (curr->isText() || curr->isInlineFlowBox()) {

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

newLogicalTop += curr->baselinePosition(baselineType) - fontMetrics.ascent(baselineType);

@@ -1138,7 +1138,7 @@ void InlineFlowBox::clearTruncation()

LayoutUnit InlineFlowBox::computeOverAnnotationAdjustment(LayoutUnit allowedPosition) const

{

- LayoutUnit result = 0;

+ LayoutUnit result;

for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {

if (curr->lineLayoutItem().isOutOfFlowPositioned())

continue; // Positioned placeholders don't affect calculations.

@@ -1186,7 +1186,7 @@ LayoutUnit InlineFlowBox::computeOverAnnotationAdjustment(LayoutUnit allowedPosi

LayoutUnit InlineFlowBox::computeUnderAnnotationAdjustment(LayoutUnit allowedPosition) const

{

- LayoutUnit result = 0;

+ LayoutUnit result;

for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {

if (curr->lineLayoutItem().isOutOfFlowPositioned())

continue; // Positioned placeholders don't affect calculations.