From 59ad782b2b05b07aa6eb961aa4d62e934093cbd1 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Thu, 4 May 2017 18:20:35 +0000 Subject: Revert "SkTypeface::getAdvancedMetrics(): cleanup" This reverts commit cef018896e5cad8eb46a536b60cdf79ebe2b0191. Reason for revert: broke chromium roll (windows). Original change's description: > SkTypeface::getAdvancedMetrics(): cleanup > > - 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: I37571ebcc383ba9eb21bc20c60c734e3ca317582 > Reviewed-on: https://skia-review.googlesource.com/15311 > Reviewed-by: Ben Wagner > Commit-Queue: Hal Canary > TBR=halcanary@google.com,bungeman@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I84c7d53df566aaf83427e3368edaa02b7b5a9cb8 Reviewed-on: https://skia-review.googlesource.com/15319 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- tests/TypefaceTest.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/TypefaceTest.cpp') diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index 1da94bb8a6..8d7ac31b99 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "SkAdvancedTypefaceMetrics.h" #include "SkData.h" #include "SkFixed.h" #include "SkFontMgr.h" @@ -197,9 +196,9 @@ protected: return nullptr; } void onFilterRec(SkScalerContextRec*) const override { } - std::unique_ptr onGetAdvancedMetrics() const override { - return nullptr; - } + virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( + PerGlyphInfo, + const uint32_t*, uint32_t) 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