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

Index: third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp

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

index 1456c03367f67b26d9efcc7891c993e13e5b39bd..d2a2287b04d9d4ca566d4a18cc2fe383baf4e99d 100644

--- a/third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp

+++ b/third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp

@@ -113,7 +113,7 @@ FloatRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment&

ASSERT(scalingFactor);

const Font& scaledFont = lineLayoutItem.scaledFont();

- const FontMetrics& scaledFontMetrics = scaledFont.fontMetrics();

+ const FontMetrics& scaledFontMetrics = scaledFont.getFontMetrics();

FloatPoint textOrigin(fragment.x, fragment.y);

if (scalingFactor != 1)

textOrigin.scale(scalingFactor, scalingFactor);

@@ -233,7 +233,7 @@ LayoutRect SVGInlineTextBox::calculateBoundaries() const

LineLayoutSVGInlineText lineLayoutItem = LineLayoutSVGInlineText(this->getLineLayoutItem());

float scalingFactor = lineLayoutItem.scalingFactor();

ASSERT(scalingFactor);

- LayoutUnit baseline(lineLayoutItem.scaledFont().fontMetrics().floatAscent() / scalingFactor);

+ LayoutUnit baseline(lineLayoutItem.scaledFont().getFontMetrics().floatAscent() / scalingFactor);

LayoutRect textBoundingRect;

for (const SVGTextFragment& fragment : m_textFragments)

@@ -259,7 +259,7 @@ bool SVGInlineTextBox::nodeAtPoint(HitTestResult& result, const HitTestLocation&

if (locationInContainer.intersects(rect)) {

LineLayoutSVGInlineText lineLayoutItem = LineLayoutSVGInlineText(this->getLineLayoutItem());

ASSERT(lineLayoutItem.scalingFactor());

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

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

FloatPoint floatLocation = FloatPoint(locationInContainer.point());

for (const SVGTextFragment& fragment : m_textFragments) {