third_party/WebKit/Source/core/layout/LayoutInline.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/LayoutImageResource.cpp ('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 c1337bf4f95bc6be3b35ab2289d0d64ac0303b4c..897fc33211125f2bb5b63df1556ab9c3c10b4318 100644

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

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

@@ -212,14 +212,14 @@ void LayoutInline::updateAlwaysCreateLineBoxes(bool fullLayout)

|| (parentLayoutInline && parentStyle.verticalAlign() != VerticalAlignBaseline)

|| style()->verticalAlign() != VerticalAlignBaseline

|| style()->getTextEmphasisMark() != TextEmphasisMarkNone

- || (checkFonts && (!parentStyle.font().fontMetrics().hasIdenticalAscentDescentAndLineGap(style()->font().fontMetrics())

+ || (checkFonts && (!parentStyle.font().getFontMetrics().hasIdenticalAscentDescentAndLineGap(style()->font().getFontMetrics())

|| parentStyle.lineHeight() != style()->lineHeight()));

if (!alwaysCreateLineBoxesNew && checkFonts && document().styleEngine().usesFirstLineRules()) {

// Have to check the first line style as well.

const ComputedStyle& firstLineParentStyle = parent()->styleRef(true);

const ComputedStyle& childStyle = styleRef(true);

- alwaysCreateLineBoxesNew = !firstLineParentStyle.font().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle.font().fontMetrics())

+ alwaysCreateLineBoxesNew = !firstLineParentStyle.font().getFontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle.font().getFontMetrics())

|| childStyle.verticalAlign() != VerticalAlignBaseline

|| firstLineParentStyle.lineHeight() != childStyle.lineHeight();

}

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

LayoutBox* currBox = toLayoutBox(curr);

if (currBox->inlineBoxWrapper()) {

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

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

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

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

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

if (isHorizontal) {

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

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

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

} else {

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

RootInlineBox& rootBox = childLine->root();

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

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

if (isHorizontal) {

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

logicalTop,

@@ -602,9 +602,9 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay

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

RootInlineBox& rootBox = childText->root();

LayoutUnit logicalTop = LayoutUnit(rootBox.logicalTop()

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

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

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

+ + (rootBox.getLineLayoutItem().style(rootBox.isFirstLineStyle())->font().getFontMetrics().ascent()

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

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

if (isHorizontal)

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

else

@@ -1257,7 +1257,7 @@ LayoutUnit LayoutInline::lineHeight(bool firstLine, LineDirectionMode /*directio

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

{

ASSERT(linePositionMode == PositionOnContainingLine);

- const FontMetrics& fontMetrics = style(firstLine)->fontMetrics();

+ const FontMetrics& fontMetrics = style(firstLine)->getFontMetrics();

return fontMetrics.ascent(baselineType) + (lineHeight(firstLine, direction, linePositionMode) - fontMetrics.height()) / 2;

}