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

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

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

index 2e0d778bfa92b43607970c7a9935b34e26a42fa3..80aa8af9b149a7407e0443f17e99f3eeac0c1eb5 100644

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

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

@@ -37,13 +37,13 @@ float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter)

UChar lastCharacter = m_lastCharacter;

m_lastCharacter = currentCharacter;

- if (!m_font.fontDescription().letterSpacing() && !m_font.fontDescription().wordSpacing())

+ if (!m_font.getFontDescription().letterSpacing() && !m_font.getFontDescription().wordSpacing())

return 0;

- float spacing = m_font.fontDescription().letterSpacing();

- if (currentCharacter && lastCharacter && m_font.fontDescription().wordSpacing()) {

+ float spacing = m_font.getFontDescription().letterSpacing();

+ if (currentCharacter && lastCharacter && m_font.getFontDescription().wordSpacing()) {

if (Character::treatAsSpace(currentCharacter) && !Character::treatAsSpace(lastCharacter))

- spacing += m_font.fontDescription().wordSpacing();

+ spacing += m_font.getFontDescription().wordSpacing();

}

if (m_effectiveZoom != 1)