diff options
author | bungeman <bungeman@google.com> | 2015-06-17 12:07:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-17 12:07:10 -0700 |
commit | 77f85adadbc3448f4302559c14d8abf8724160da (patch) | |
tree | 9690dc6a19a23d83629d101e285135769da68fe4 /src/ports/SkFontMgr_android.cpp | |
parent | 2a4685f8bb1bf3cf098c5fee78a71e2f4204e428 (diff) |
Move Android SkFontMgr::Factory to its own file.
Review URL: https://codereview.chromium.org/1190993002
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
-rw-r--r-- | src/ports/SkFontMgr_android.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index a67c6814ea..f176b9cbec 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -15,16 +15,10 @@ #include "SkTDArray.h" #include "SkTSearch.h" #include "SkTypeface.h" -#include "SkTypeface_android.h" #include "SkTypefaceCache.h" #include <limits> -// For test only. -static const char* gTestFontsXml = NULL; -static const char* gTestFallbackFontsXml = NULL; -static const char* gTestBasePath = NULL; - class SkTypeface_Android : public SkTypeface_FreeType { public: SkTypeface_Android(const SkFontStyle& style, @@ -574,7 +568,6 @@ private: typedef SkFontMgr INHERITED; }; -/////////////////////////////////////////////////////////////////////////////// #ifdef SK_DEBUG static char const * const gSystemFontUseStrings[] = { "OnlyCustom", "PreferCustom", "PreferSystem" @@ -593,32 +586,3 @@ SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom) { return SkNEW_ARGS(SkFontMgr_Android, (custom)); } - -SkFontMgr* SkFontMgr::Factory() { - // These globals exist so that Chromium can override the environment. - // TODO: these globals need to be removed, and Chromium use SkFontMgr_New_Android instead. - if ((gTestFontsXml || gTestFallbackFontsXml) && gTestBasePath) { - SkFontMgr_Android_CustomFonts custom = { - SkFontMgr_Android_CustomFonts::kOnlyCustom, - gTestBasePath, - gTestFontsXml, - gTestFallbackFontsXml - }; - return SkFontMgr_New_Android(&custom); - } - - return SkFontMgr_New_Android(NULL); -} - -void SkUseTestFontConfigFile(const char* fontsXml, const char* fallbackFontsXml, - const char* basePath) -{ - gTestFontsXml = fontsXml; - gTestFallbackFontsXml = fallbackFontsXml; - gTestBasePath = basePath; - SkASSERT(gTestFontsXml); - SkASSERT(gTestFallbackFontsXml); - SkASSERT(gTestBasePath); - SkDEBUGF(("Test BasePath: %s Fonts: %s FallbackFonts: %s\n", - gTestBasePath, gTestFontsXml, gTestFallbackFontsXml)); -} |