third_party/WebKit/Source/core/layout/line/RootInlineBox.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/RootInlineBox.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/InlineFlowBox.cpp ('k') | third_party/WebKit/Source/core/layout/shapes/BoxShape.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dfac26e8726af85d958f595dada58e8f1cb734b7..d25f755dc03b806a99b0d10db1dcf3530b0e641c 100644

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

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

@@ -573,7 +573,7 @@ void RootInlineBox::ascentAndDescentForBox(InlineBox* box, GlyphOverflowAndFallb

if (usedFonts && !usedFonts->isEmpty() && (box->getLineLayoutItem().style(isFirstLineStyle())->lineHeight().isNegative() && includeLeading)) {

usedFonts->append(box->getLineLayoutItem().style(isFirstLineStyle())->font().primaryFont());

for (size_t i = 0; i < usedFonts->size(); ++i) {

- const FontMetrics& fontMetrics = usedFonts->at(i)->fontMetrics();

+ const FontMetrics& fontMetrics = usedFonts->at(i)->getFontMetrics();

int usedFontAscent = fontMetrics.ascent(baselineType());

int usedFontDescent = fontMetrics.descent(baselineType());

int halfLeading = (fontMetrics.lineSpacing() - fontMetrics.height()) / 2;

@@ -639,8 +639,8 @@ LayoutUnit RootInlineBox::verticalPositionForBox(InlineBox* box, VerticalPositio

if (verticalAlign != VerticalAlignBaseline) {

const Font& font = parent.style(firstLine)->font();

- const FontMetrics& fontMetrics = font.fontMetrics();

- int fontSize = font.fontDescription().computedPixelSize();

+ const FontMetrics& fontMetrics = font.getFontMetrics();

+ int fontSize = font.getFontDescription().computedPixelSize();

LineDirectionMode lineDirection = parent.isHorizontalWritingMode() ? HorizontalLine : VerticalLine;