From 46cc3dabaff7daa6b57e3c33997153d986219579 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 9 May 2018 11:50:34 -0400 Subject: Revert "Revert "SkAdvancedTypefaceMetrics: factor out GlyphToUnicode"" This reverts commit 97c1108607584b6050a6880d6ce22846e4913a92. Change-Id: Ic3c6addc64ced39766bbee3e10b4d88faf61ba2f Reviewed-on: https://skia-review.googlesource.com/127021 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- tests/TypefaceTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/TypefaceTest.cpp') diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index b6b71aeb8c..34fa3575f1 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -203,11 +203,11 @@ DEF_TEST(Typeface, reporter) { namespace { -class SkEmptyTypeface : public SkTypeface { +class EmptyTypeface : public SkTypeface { public: - static sk_sp Create() { return sk_sp(new SkEmptyTypeface()); } + static sk_sp Create() { return sk_sp(new EmptyTypeface()); } protected: - SkEmptyTypeface() : SkTypeface(SkFontStyle(), true) { } + EmptyTypeface() : SkTypeface(SkFontStyle(), true) { } SkStreamAsset* onOpenStream(int* ttcIndex) const override { return nullptr; } SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, @@ -255,12 +255,12 @@ static int count(skiatest::Reporter* reporter, const SkTypefaceCache& cache) { } DEF_TEST(TypefaceCache, reporter) { - sk_sp t1(SkEmptyTypeface::Create()); + sk_sp t1(EmptyTypeface::Create()); { SkTypefaceCache cache; REPORTER_ASSERT(reporter, count(reporter, cache) == 0); { - sk_sp t0(SkEmptyTypeface::Create()); + sk_sp t0(EmptyTypeface::Create()); cache.add(t0.get()); REPORTER_ASSERT(reporter, count(reporter, cache) == 1); cache.add(t1.get()); -- cgit v1.2.3