aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
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 /src
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 'src')
-rw-r--r--src/core/SkTypeface.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 6b1e3618c6..8e90f51a9b 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -29,8 +29,6 @@ extern void WhitelistSerializeTypeface(const SkTypeface*, SkWStream* );
#define SK_TYPEFACE_DELEGATE nullptr
#endif
-sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char[], SkFontStyle) = nullptr;
-
void (*gSerializeTypefaceDelegate)(const SkTypeface*, SkWStream* ) = SK_TYPEFACE_DELEGATE;
sk_sp<SkTypeface> (*gDeserializeTypefaceDelegate)(SkStream* ) = nullptr;
@@ -129,12 +127,6 @@ bool SkTypeface::Equal(const SkTypeface* facea, const SkTypeface* faceb) {
sk_sp<SkTypeface> SkTypeface::MakeFromName(const char name[],
SkFontStyle fontStyle) {
- if (gCreateTypefaceDelegate) {
- sk_sp<SkTypeface> result = (*gCreateTypefaceDelegate)(name, fontStyle);
- if (result) {
- return result;
- }
- }
if (nullptr == name && (fontStyle.slant() == SkFontStyle::kItalic_Slant ||
fontStyle.slant() == SkFontStyle::kUpright_Slant) &&
(fontStyle.weight() == SkFontStyle::kBold_Weight ||