third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.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/platform/fonts/opentype/OpenTypeVerticalData.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/platform/fonts/mac/FontPlatformDataMac.mm ('k') | third_party/WebKit/Source/platform/fonts/shaping/CachingWordShapeIterator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp

index 556e52f3a45835283c9a3c14bb05470a846fba5a..62a2a1578d3ed7a42b5194b6db0c2715fffd2918 100644

--- a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp

+++ b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp

@@ -216,14 +216,14 @@ float OpenTypeVerticalData::advanceHeight(const SimpleFontData* font, Glyph glyp

}

// No vertical info in the font file; use height as advance.

- return font->fontMetrics().height();

+ return font->getFontMetrics().height();

}

void OpenTypeVerticalData::getVerticalTranslationsForGlyphs(const SimpleFontData* font, const Glyph* glyphs, size_t count, float* outXYArray) const

{

size_t countWidths = m_advanceWidths.size();

ASSERT(countWidths > 0);

- const FontMetrics& metrics = font->fontMetrics();

+ const FontMetrics& metrics = font->getFontMetrics();

float sizePerUnit = font->sizePerUnit();

float ascent = metrics.ascent();

bool useVORG = hasVORG();