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

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

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

index 2b584b6aa97a7cbca89f122d557532d2053b1acb..68f4a4c01b3c5900252872c90f3b7cb25a06bf9e 100644

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

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

@@ -122,8 +122,8 @@ static void computeGlyphOverflow(SVGInlineTextBox* textBox, SVGTextFragment& tex

FloatRect glyphOverflowBounds;

float width = scaledFont.width(run, nullptr, &glyphOverflowBounds);

- float ascent = scaledFont.fontMetrics().floatAscent();

- float descent = scaledFont.fontMetrics().floatDescent();

+ float ascent = scaledFont.getFontMetrics().floatAscent();

+ float descent = scaledFont.getFontMetrics().floatDescent();

textFragment.glyphOverflow.setFromBounds(glyphOverflowBounds, ascent, descent, width);

textFragment.glyphOverflow.top /= scalingFactor;

textFragment.glyphOverflow.left /= scalingFactor;

@@ -403,7 +403,7 @@ void SVGTextLayoutEngine::layoutTextOnLineOrPath(SVGInlineTextBox* textBox, Line

// Font::width() calculates the resolved FontOrientation for each character,

// but is not exposed today to avoid the API complexity.

UChar32 currentCharacter = textLineLayout.codepointAt(m_visualMetricsIterator.characterOffset());

- FontOrientation fontOrientation = font.fontDescription().orientation();

+ FontOrientation fontOrientation = font.getFontDescription().orientation();

fontOrientation = adjustOrientationForCharacterInMixedVertical(fontOrientation, currentCharacter);

// Calculate glyph advance.