Index: src/fonts/SkRemotableFontMgr.cpp |
diff --git a/src/fonts/SkRemotableFontMgr.cpp b/src/fonts/SkRemotableFontMgr.cpp |
index 633e91458bbb34d5c65fb3d64dc3ac5f877ebd5d..3681f2c8c77f9d9db22c4dfb18025f4f50266352 100644 |
--- a/src/fonts/SkRemotableFontMgr.cpp |
+++ b/src/fonts/SkRemotableFontMgr.cpp |
@@ -16,11 +16,12 @@ SkRemotableFontIdentitySet::SkRemotableFontIdentitySet(int count, SkFontIdentity |
*data = fData; |
} |
-SkRemotableFontIdentitySet* SkRemotableFontIdentitySet::NewEmptyImpl() { |
+// As a template argument, this must have external linkage. |
+SkRemotableFontIdentitySet* sk_remotable_font_identity_set_new() { |
return SkNEW(SkRemotableFontIdentitySet); |
} |
+SK_DECLARE_STATIC_LAZY_PTR(SkRemotableFontIdentitySet, empty, sk_remotable_font_identity_set_new); |
SkRemotableFontIdentitySet* SkRemotableFontIdentitySet::NewEmpty() { |
- SK_DECLARE_STATIC_LAZY_PTR(SkRemotableFontIdentitySet, empty, NewEmptyImpl); |
return SkRef(empty.get()); |
} |