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

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

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

index a65a7db00aab933e29597e93a323b6886789b414..8b2556c2f3287d9022b3b746b46d523faeb8c16f 100644

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

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

@@ -465,7 +465,7 @@ static inline void calculateGlyphBoundaries(const QueryData* queryData, const SV

ASSERT(scalingFactor);

FloatPoint glyphPosition = calculateGlyphPositionWithoutTransform(queryData, fragment, startPosition);

- glyphPosition.move(0, -queryData->textLineLayout.scaledFont().fontMetrics().floatAscent() / scalingFactor);

+ glyphPosition.move(0, -queryData->textLineLayout.scaledFont().getFontMetrics().floatAscent() / scalingFactor);

extent.setLocation(glyphPosition);

// Use the SVGTextMetrics computed by SVGTextMetricsBuilder (which spends

@@ -497,7 +497,7 @@ static inline FloatRect calculateFragmentBoundaries(LineLayoutSVGInlineText text

{

float scalingFactor = textLineLayout.scalingFactor();

ASSERT(scalingFactor);

- float baseline = textLineLayout.scaledFont().fontMetrics().floatAscent() / scalingFactor;

+ float baseline = textLineLayout.scaledFont().getFontMetrics().floatAscent() / scalingFactor;

return fragment.boundingBox(baseline);

}