third_party/WebKit/Source/core/layout/LayoutInline.cpp - Issue 1656743002: Removing more implicit LayoutUnit construction

Unified Diff: third_party/WebKit/Source/core/layout/LayoutInline.cpp

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« third_party/WebKit/Source/core/layout/LayoutInline.h ('K') | « third_party/WebKit/Source/core/layout/LayoutInline.h ('k') | third_party/WebKit/Source/core/layout/LayoutListBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutInline.cpp

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

index d724d25e4d6d37093bef457f1943b25f8de0b358..a4c0baaf6e75d3d87b54f5d1938f6406c77fbb18 100644

--- a/third_party/WebKit/Source/core/layout/LayoutInline.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutInline.cpp

@@ -245,7 +245,7 @@ LayoutRect LayoutInline::localCaretRect(InlineBox* inlineBox, int, LayoutUnit* e

if (extraWidthToEndOfLine)

*extraWidthToEndOfLine = LayoutUnit();

- LayoutRect caretRect = localCaretRectForEmptyElement(borderAndPaddingWidth(), 0);

+ LayoutRect caretRect = localCaretRectForEmptyElement(borderAndPaddingWidth(), LayoutUnit());

if (InlineBox* firstBox = firstLineBox()) {

// FIXME: the call to roundedLayoutPoint() below is temporary and should be removed once

@@ -562,8 +562,8 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay

LayoutBox* currBox = toLayoutBox(curr);

if (currBox->inlineBoxWrapper()) {

RootInlineBox& rootBox = currBox->inlineBoxWrapper()->root();

- int logicalTop = rootBox.logicalTop() + (rootBox.lineLayoutItem().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent());

- int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height();

+ LayoutUnit logicalTop = rootBox.logicalTop() + (rootBox.lineLayoutItem().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent());

+ LayoutUnit logicalHeight(container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height());

if (isHorizontal) {

yield(LayoutRect(LayoutUnit(currBox->inlineBoxWrapper()->x() - currBox->marginLeft()), LayoutUnit(logicalTop),

LayoutUnit(currBox->size().width() + currBox->marginWidth()), LayoutUnit(logicalHeight)));

@@ -580,17 +580,17 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay

} else {

for (InlineFlowBox* childLine = currInline->firstLineBox(); childLine; childLine = childLine->nextLineBox()) {

RootInlineBox& rootBox = childLine->root();

- int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height();

+ LayoutUnit logicalHeight(container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height());

if (isHorizontal) {

yield(LayoutRect(LayoutUnit(childLine->x() - childLine->marginLogicalLeft()),

- LayoutUnit(logicalTop),

+ logicalTop,

LayoutUnit(childLine->logicalWidth() + childLine->marginLogicalLeft() + childLine->marginLogicalRight()),

- LayoutUnit(logicalHeight)));

+ logicalHeight));

} else {

- yield(LayoutRect(LayoutUnit(logicalTop),

+ yield(LayoutRect(logicalTop,

LayoutUnit(childLine->y() - childLine->marginLogicalLeft()),

- LayoutUnit(logicalHeight),

+ logicalHeight,

LayoutUnit(childLine->logicalWidth() + childLine->marginLogicalLeft() + childLine->marginLogicalRight())));

}

@@ -599,8 +599,10 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay

LayoutText* currText = toLayoutText(curr);

for (InlineTextBox* childText = currText->firstTextBox(); childText; childText = childText->nextTextBox()) {

RootInlineBox& rootBox = childText->root();

- int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height();

+ LayoutUnit logicalTop = LayoutUnit(rootBox.logicalTop()

+ + (rootBox.lineLayoutItem().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()

+ - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()));

+ LayoutUnit logicalHeight(container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height());

if (isHorizontal)

yield(LayoutRect(childText->x(), logicalTop, childText->logicalWidth(), logicalHeight));

else

@@ -707,7 +709,7 @@ LayoutUnit LayoutInline::offsetTop() const

static LayoutUnit computeMargin(const LayoutInline* layoutObject, const Length& margin)

{

if (margin.isFixed())

- return margin.value();

+ return LayoutUnit(margin.value());

if (margin.hasPercent())

return minimumValueForLength(margin, std::max(LayoutUnit(), layoutObject->containingBlock()->availableLogicalWidth()));

return LayoutUnit();

@@ -1062,7 +1064,7 @@ LayoutRect LayoutInline::clippedOverflowRect(const LayoutBoxModelObject* paintIn

LayoutRect LayoutInline::visualOverflowRect() const

{

LayoutRect overflowRect = linesVisualOverflowBoundingBox();

- LayoutUnit outlineOutset = style()->outlineOutsetExtent();

+ LayoutUnit outlineOutset(style()->outlineOutsetExtent());

if (outlineOutset) {

Vector<LayoutRect> rects;

// We have already included outline extents of line boxes in linesVisualOverflowBoundingBox(),

@@ -1292,10 +1294,10 @@ LayoutUnit LayoutInline::lineHeight(bool firstLine, LineDirectionMode /*directio

if (firstLine && document().styleEngine().usesFirstLineRules()) {

const ComputedStyle* s = style(firstLine);

if (s != style())

- return s->computedLineHeight();

+ return LayoutUnit(s->computedLineHeight());

}

- return style()->computedLineHeight();

+ return LayoutUnit(style()->computedLineHeight());

}

int LayoutInline::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const

@@ -1424,8 +1426,8 @@ void LayoutInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)

container = this;

FloatPoint absPos = container->localToAbsolute();

- region.bounds.setX(absPos.x() + region.bounds.x());

- region.bounds.setY(absPos.y() + region.bounds.y());

+ region.bounds.setX(LayoutUnit(absPos.x() + region.bounds.x()));

+ region.bounds.setY(LayoutUnit(absPos.y() + region.bounds.y()));

regions.append(region);

}