third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h - 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/BreakingContextInlineHeaders.h

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

Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

index f5a1e42a970ad3a4d7153f9487b04add4370b757..66ed8417954b7d817dac217bfec61dac9814a53e 100644

--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

@@ -185,7 +185,7 @@ inline bool requiresLineBoxForContent(LineLayoutInline flow, const LineInfo& lin

if (flow.document().inNoQuirksMode()

&& (flow.style(lineInfo.isFirstLine())->lineHeight() != parent.style(lineInfo.isFirstLine())->lineHeight()

|| flow.style()->verticalAlign() != parent.style()->verticalAlign()

- || !parent.style()->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(flow.style()->font().fontMetrics())))

+ || !parent.style()->font().getFontMetrics().hasIdenticalAscentDescentAndLineGap(flow.style()->font().getFontMetrics())))

return true;

return false;

}

@@ -602,7 +602,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool

// Non-zero only when kerning is enabled, in which case we measure

// words with their trailing space, then subtract its width.

- float wordTrailingSpaceWidth = (font.fontDescription().getTypesettingFeatures() & Kerning) ?

+ float wordTrailingSpaceWidth = (font.getFontDescription().getTypesettingFeatures() & Kerning) ?

font.width(constructTextRun(font, &spaceCharacter, 1, style, style.direction())) + wordSpacing

: 0;