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

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

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

index ef7723369f058d73a7baa6ccc55cb92dfb5f844b..f6e6fb66e2013fe82a9c30380460e507fbc45a37 100644

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

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

@@ -50,7 +50,7 @@ SVGTextMetrics::SVGTextMetrics(LineLayoutSVGInlineText textLayoutItem, const Tex

// Calculate width/height using the scaled font, divide this result by the scalingFactor afterwards.

m_width = scaledFont.width(run) / scalingFactor;

- m_height = scaledFont.fontMetrics().floatHeight() / scalingFactor;

+ m_height = scaledFont.getFontMetrics().floatHeight() / scalingFactor;

ASSERT(run.length() >= 0);

m_length = static_cast<unsigned>(run.length());

@@ -98,7 +98,7 @@ SVGTextMetrics::SVGTextMetrics(LineLayoutSVGInlineText textLayoutItem, unsigned

ASSERT(scalingFactor);

m_width = width / scalingFactor;

- m_height = textLayoutItem.scaledFont().fontMetrics().floatHeight() / scalingFactor;

+ m_height = textLayoutItem.scaledFont().getFontMetrics().floatHeight() / scalingFactor;

m_length = length;

}