aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2018-07-03 13:31:13 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-03 18:13:55 +0000
commit3241149b8cc607aaeaf7897cd1e7f712354dda7e (patch)
treeb413adf54081e68aba03cf7f78435ca565a3fa9b /dm
parent28e2423afd46e5853289dbcee1978ef219a97668 (diff)
Remove gCreateTypefaceDelegate.
The PortableFontMgr is used instead. Change-Id: I03ecdcbef380dde2b206293e17a325cad69d7514 Reviewed-on: https://skia-review.googlesource.com/139165 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp15
1 files changed, 0 insertions, 15 deletions
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<SkTypeface> 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<SkTypeface> (*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");