From 44a9d5726d4c6f323fcc8c828cfdf6dbd3e12048 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 15 May 2018 11:06:08 -0400 Subject: Mark SkFontMgr_FCI methods as not implmented. The SkFontMgr_FCI class is an attempt at transitioning off of SkFontConfigInterface to SkFontMgr. However, since SkFontMgr_FCI must wrap a SkFontConfigInterface it is limited in what parts of the SkFontMgr interface it can actually implement. This CL marks the unimplemented methods with SK_ABORT("Not implemented.") to make this explicit. Change-Id: I3ee1a0af549ac2257bc7098d6367db00a108e3ed Reviewed-on: https://skia-review.googlesource.com/128340 Reviewed-by: Herb Derby Commit-Queue: Ben Wagner --- src/ports/SkFontMgr_FontConfigInterface.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/ports') diff --git a/src/ports/SkFontMgr_FontConfigInterface.cpp b/src/ports/SkFontMgr_FontConfigInterface.cpp index c60e3efff2..dacc054f6c 100644 --- a/src/ports/SkFontMgr_FontConfigInterface.cpp +++ b/src/ports/SkFontMgr_FontConfigInterface.cpp @@ -172,6 +172,7 @@ public: protected: int onCountFamilies() const override { + SK_ABORT("Not implemented."); return 0; } @@ -185,20 +186,31 @@ protected: } SkFontStyleSet* onMatchFamily(const char familyName[]) const override { + SK_ABORT("Not implemented."); return new SkFontStyleSet_FCI(); } - SkTypeface* onMatchFamilyStyle(const char familyName[], - const SkFontStyle&) const override { return nullptr; } + SkTypeface* onMatchFamilyStyle(const char familyName[], const SkFontStyle&) const override { + SK_ABORT("Not implemented."); + return nullptr; + } + SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, const char* bcp47[], int bcp47Count, SkUnichar character) const override { + SK_ABORT("Not implemented."); return nullptr; } - SkTypeface* onMatchFaceStyle(const SkTypeface*, - const SkFontStyle&) const override { return nullptr; } - sk_sp onMakeFromData(sk_sp, int ttcIndex) const override { return nullptr; } + SkTypeface* onMatchFaceStyle(const SkTypeface*, const SkFontStyle&) const override { + SK_ABORT("Not implemented."); + return nullptr; + } + + sk_sp onMakeFromData(sk_sp, int ttcIndex) const override { + SK_ABORT("Not implemented."); + return nullptr; + } sk_sp onMakeFromStreamIndex(std::unique_ptr stream, int ttcIndex) const override { -- cgit v1.2.3