| Index: src/core/SkFontHost.cpp
|
| diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp
|
| index c582ba5bfd4ca1ba11619c766f8ee53cc710a4e3..ce73491c7271e4fdc40a510ecf1f0671a7156eee 100644
|
| --- a/src/core/SkFontHost.cpp
|
| +++ b/src/core/SkFontHost.cpp
|
| @@ -198,12 +198,14 @@ SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[],
|
| return this->onLegacyCreateTypeface(familyName, styleBits);
|
| }
|
|
|
| -SkFontMgr* SkFontMgr::CreateDefault() {
|
| +// As a template argument this must have external linkage.
|
| +SkFontMgr* sk_fontmgr_create_default() {
|
| SkFontMgr* fm = SkFontMgr::Factory();
|
| return fm ? fm : SkNEW(SkEmptyFontMgr);
|
| }
|
|
|
| +SK_DECLARE_STATIC_LAZY_PTR(SkFontMgr, singleton, sk_fontmgr_create_default);
|
| +
|
| SkFontMgr* SkFontMgr::RefDefault() {
|
| - SK_DECLARE_STATIC_LAZY_PTR(SkFontMgr, singleton, CreateDefault);
|
| return SkRef(singleton.get());
|
| }
|
|
|