aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_custom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ports/SkFontMgr_custom.cpp')
-rw-r--r--src/ports/SkFontMgr_custom.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/ports/SkFontMgr_custom.cpp b/src/ports/SkFontMgr_custom.cpp
index 5cfdb081d6..1b6baa19a4 100644
--- a/src/ports/SkFontMgr_custom.cpp
+++ b/src/ports/SkFontMgr_custom.cpp
@@ -420,15 +420,9 @@ private:
SkString fBaseDirectory;
};
-#ifdef SK_LEGACY_FONTMGR_FACTORY
-SK_API SkFontMgr* SkFontMgr_New_Custom_Directory(const char* dir) {
- return new SkFontMgr_Custom(DirectorySystemFontLoader(dir));
-}
-#else
SK_API sk_sp<SkFontMgr> SkFontMgr_New_Custom_Directory(const char* dir) {
return sk_make_sp<SkFontMgr_Custom>(DirectorySystemFontLoader(dir));
}
-#endif
///////////////////////////////////////////////////////////////////////////////
@@ -504,15 +498,9 @@ private:
const SkEmbeddedResourceHeader* fHeader;
};
-#ifdef SK_LEGACY_FONTMGR_FACTORY
-SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) {
- return new SkFontMgr_Custom(EmbeddedSystemFontLoader(header));
-}
-#else
sk_sp<SkFontMgr> SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) {
return sk_make_sp<SkFontMgr_Custom>(EmbeddedSystemFontLoader(header));
}
-#endif
///////////////////////////////////////////////////////////////////////////////
@@ -530,12 +518,6 @@ public:
};
-#ifdef SK_LEGACY_FONTMGR_FACTORY
-SK_API SkFontMgr* SkFontMgr_New_Custom_Empty() {
- return new SkFontMgr_Custom(EmptyFontLoader());
-}
-#else
SK_API sk_sp<SkFontMgr> SkFontMgr_New_Custom_Empty() {
return sk_make_sp<SkFontMgr_Custom>(EmptyFontLoader());
}
-#endif