From 209e4b1b70a5e9c2f504de15f038999ed9ee4ae5 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Thu, 4 May 2017 14:23:55 -0400 Subject: Revert "Revert "SkTypeface::getAdvancedMetrics(): cleanup"" This reverts commit 59ad782b2b05b07aa6eb961aa4d62e934093cbd1. - SkAdvancedTypefaceMetrics is a struct not a class - SkTypeface::PerGlyphInfo is gone - s/getAdvancedTypefaceMetrics/getAdvancedMetrics/g - s/onGetAdvancedTypefaceMetrics/onGetAdvancedMetrics/g - [on]getAdvancedMetrics now return unique_ptr rather than bare ptr. - [on]getAdvancedMetrics no longer has parameters. (Only caller always used same arguments.) - SkAdvancedTypefaceMetrics uses C++11 in-class member initializers. - SkAdvancedTypefaceMetrics no longer inherits from SkRefCnt Change-Id: I91b56e60f7d9de7d46c426c6bd34ce124e0cf00e Reviewed-on: https://skia-review.googlesource.com/15360 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- tests/TypefaceTest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/TypefaceTest.cpp') diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index 8d7ac31b99..1da94bb8a6 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkAdvancedTypefaceMetrics.h" #include "SkData.h" #include "SkFixed.h" #include "SkFontMgr.h" @@ -196,9 +197,9 @@ protected: return nullptr; } void onFilterRec(SkScalerContextRec*) const override { } - virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( - PerGlyphInfo, - const uint32_t*, uint32_t) const override { return nullptr; } + std::unique_ptr onGetAdvancedMetrics() const override { + return nullptr; + } void onGetFontDescriptor(SkFontDescriptor*, bool*) const override { } virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const override { -- cgit v1.2.3