From 9eb1c7d80fb3a0b23c0f6a156424a381b4120d3c Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 3 Jul 2018 16:15:54 -0400 Subject: Revert "Revert "Remove gCreateTypefaceDelegate."" This reverts commit 58a1605d2b9bab077f53b6a223f9e7ce1891d3ea. Try to make glyph paths as immutable as possible. Change-Id: Ibef920c4417304e37ca4d4384515e9e7fc31aabf Reviewed-on: https://skia-review.googlesource.com/139172 Commit-Queue: Ben Wagner Reviewed-by: Mike Klein Reviewed-by: Herb Derby --- dm/DM.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'dm') diff --git a/dm/DM.cpp b/dm/DM.cpp index 28369e9c08..4656381c13 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -1291,20 +1291,6 @@ static void run_test(skiatest::Test test, const GrContextOptions& grCtxOptions) /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -#define PORTABLE_FONT_PREFIX "Toy Liberation " - -static sk_sp create_from_name(const char familyName[], SkFontStyle style) { - if (familyName && strlen(familyName) > sizeof(PORTABLE_FONT_PREFIX) - && !strncmp(familyName, PORTABLE_FONT_PREFIX, sizeof(PORTABLE_FONT_PREFIX) - 1)) { - return sk_tool_utils::create_portable_typeface(familyName, style); - } - return nullptr; -} - -#undef PORTABLE_FONT_PREFIX - -extern sk_sp (*gCreateTypefaceDelegate)(const char [], SkFontStyle ); - int main(int argc, char** argv) { #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_HAS_HEIF_LIBRARY) android::ProcessState::self()->startThreadPool(); @@ -1357,7 +1343,6 @@ int main(int argc, char** argv) { JsonWriter::DumpJson(); // It's handy for the bots to assume this is ~never missing. SkAutoGraphics ag; SkTaskGroup::Enabler enabled(FLAGS_threads); - gCreateTypefaceDelegate = &create_from_name; if (nullptr == GetResourceAsData("images/color_wheel.png")) { info("Some resources are missing. Do you need to set --resourcePath?\n"); -- cgit v1.2.3