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

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 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/line/BreakingContextInlineHeaders.h ('k') | third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp » ('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 51644d2d2d89388a2650b13b3b3ad9542c057402..3f3c4566c6a1f28c08afbcf32e969c294ad34225 100644

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

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

@@ -144,13 +144,13 @@ LayoutUnit InlineBox::logicalHeight() const

return virtualLogicalHeight();

if (getLineLayoutItem().isText())

- return m_bitfields.isText() ? LayoutUnit(getLineLayoutItem().style(isFirstLineStyle())->fontMetrics().height()) : LayoutUnit();

+ return m_bitfields.isText() ? LayoutUnit(getLineLayoutItem().style(isFirstLineStyle())->getFontMetrics().height()) : LayoutUnit();

if (getLineLayoutItem().isBox() && parent())

return isHorizontal() ? toLayoutBox(layoutObject()).size().height() : toLayoutBox(layoutObject()).size().width();

ASSERT(isInlineFlowBox());

LineLayoutBoxModel flowObject = boxModelObject();

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

+ const FontMetrics& fontMetrics = getLineLayoutItem().style(isFirstLineStyle())->getFontMetrics();

LayoutUnit result(fontMetrics.height());

if (parent())

result += flowObject.borderAndPaddingLogicalHeight();