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

Index: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

index 0728c4f7e92c1fea49b22ac72cf6f3f1427da78b..709ea20d817d100509c6e2248d1ff49504de6fce 100644

--- a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

+++ b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

@@ -41,11 +41,11 @@ float SVGTextLayoutEngineBaseline::calculateBaselineShift(const ComputedStyle& s

switch (svgStyle.baselineShift()) {

case BS_LENGTH:

- return SVGLengthContext::valueForLength(svgStyle.baselineShiftValue(), style, m_font.fontDescription().computedPixelSize() / m_effectiveZoom);

+ return SVGLengthContext::valueForLength(svgStyle.baselineShiftValue(), style, m_font.getFontDescription().computedPixelSize() / m_effectiveZoom);

case BS_SUB:

- return -m_font.fontMetrics().floatHeight() / 2 / m_effectiveZoom;

+ return -m_font.getFontMetrics().floatHeight() / 2 / m_effectiveZoom;

case BS_SUPER:

- return m_font.fontMetrics().floatHeight() / 2 / m_effectiveZoom;

+ return m_font.getFontMetrics().floatHeight() / 2 / m_effectiveZoom;

default:

ASSERT_NOT_REACHED();

return 0;

@@ -116,7 +116,7 @@ float SVGTextLayoutEngineBaseline::calculateAlignmentBaselineShift(bool isVertic

ASSERT(baseline != AB_AUTO && baseline != AB_BASELINE);

}

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

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

float ascent = fontMetrics.floatAscent() / m_effectiveZoom;

float descent = fontMetrics.floatDescent() / m_effectiveZoom;

float xheight = fontMetrics.xHeight() / m_effectiveZoom;