third_party/WebKit/Source/core/paint/TextPainter.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/paint/TextPainter.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/paint/TableCellPainterTest.cpp ('k') | third_party/WebKit/Source/core/paint/Transform3DRecorder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/TextPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/TextPainter.cpp b/third_party/WebKit/Source/core/paint/TextPainter.cpp

index ba057f65aa3710e49e80e98af97a261c96cce2c3..4b0bd92e84eed5819695f9596aa77cdbe99f2daf 100644

--- a/third_party/WebKit/Source/core/paint/TextPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/TextPainter.cpp

@@ -47,10 +47,10 @@ void TextPainter::setEmphasisMark(const AtomicString& emphasisMark, TextEmphasis

if (emphasisMark.isNull()) {

m_emphasisMarkOffset = 0;

} else if (position == TextEmphasisPositionOver) {

- m_emphasisMarkOffset = -m_font.fontMetrics().ascent() - m_font.emphasisMarkDescent(emphasisMark);

+ m_emphasisMarkOffset = -m_font.getFontMetrics().ascent() - m_font.emphasisMarkDescent(emphasisMark);

} else {

ASSERT(position == TextEmphasisPositionUnder);

- m_emphasisMarkOffset = m_font.fontMetrics().descent() + m_font.emphasisMarkAscent(emphasisMark);

+ m_emphasisMarkOffset = m_font.getFontMetrics().descent() + m_font.emphasisMarkAscent(emphasisMark);

}

@@ -221,7 +221,7 @@ void TextPainter::paintEmphasisMarkForCombinedText()

{

ASSERT(m_combinedText);

TextRun placeholderTextRun(&ideographicFullStopCharacter, 1);

- FloatPoint emphasisMarkTextOrigin(m_textBounds.x().toFloat(), m_textBounds.y().toFloat() + m_font.fontMetrics().ascent() + m_emphasisMarkOffset);

+ FloatPoint emphasisMarkTextOrigin(m_textBounds.x().toFloat(), m_textBounds.y().toFloat() + m_font.getFontMetrics().ascent() + m_emphasisMarkOffset);

TextRunPaintInfo textRunPaintInfo(placeholderTextRun);

textRunPaintInfo.bounds = FloatRect(m_textBounds);

m_graphicsContext.concatCTM(rotation(m_textBounds, Clockwise));