third_party/WebKit/Source/core/layout/LayoutInline.cpp - Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/.

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6

Patch Set: get-names-7: rebase Created 4 years, 10 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/LayoutGrid.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutListMarker.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 b73476fa09c7dc8a43c0a119b00da935239820c2..2b830b070a27d7c5b949c5e36aaf1bcc82416526 100644

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

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

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

LayoutBox* currBox = toLayoutBox(curr);

if (currBox->inlineBoxWrapper()) {

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

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

+ 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());

if (isHorizontal) {

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

@@ -582,7 +582,7 @@ 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());

if (isHorizontal) {

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

@@ -602,7 +602,7 @@ 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.lineLayoutItem().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()

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

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

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

if (isHorizontal)

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGrid.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutListMarker.cpp » ('j') | no next file with comments »