Index: src/ports/SkFontConfigTypeface.h |
diff --git a/src/ports/SkFontConfigTypeface.h b/src/ports/SkFontConfigTypeface.h |
index dc92f1dffb640dd0a415934c4e0310329ba34bf4..b6f8797eb7c932c615a59348cdd4965e461194e4 100644 |
--- a/src/ports/SkFontConfigTypeface.h |
+++ b/src/ports/SkFontConfigTypeface.h |
@@ -18,19 +18,14 @@ class FontConfigTypeface : public SkTypeface_FreeType { |
SkStream* fLocalStream; |
public: |
- FontConfigTypeface(Style style, |
- const SkFontConfigInterface::FontIdentity& fi, |
- const SkString& familyName) |
- : INHERITED(style, SkTypefaceCache::NewFontID(), false) |
- , fIdentity(fi) |
- , fFamilyName(familyName) |
- , fLocalStream(NULL) {} |
+ static FontConfigTypeface* Create(Style style, |
+ const SkFontConfigInterface::FontIdentity& fi, |
+ const SkString& familyName) { |
+ return SkNEW_ARGS(FontConfigTypeface, (style, fi, familyName)); |
+ } |
- FontConfigTypeface(Style style, bool fixedWidth, SkStream* localStream) |
- : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) { |
- // we default to empty fFamilyName and fIdentity |
- fLocalStream = localStream; |
- SkSafeRef(localStream); |
+ static FontConfigTypeface* Create(Style style, bool fixedWidth, SkStream* localStream) { |
+ return SkNEW_ARGS(FontConfigTypeface, (style, fixedWidth, localStream)); |
} |
virtual ~FontConfigTypeface() { |
@@ -55,6 +50,21 @@ public: |
protected: |
friend class SkFontHost; // hack until we can make public versions |
+ FontConfigTypeface(Style style, |
+ const SkFontConfigInterface::FontIdentity& fi, |
+ const SkString& familyName) |
+ : INHERITED(style, SkTypefaceCache::NewFontID(), false) |
+ , fIdentity(fi) |
+ , fFamilyName(familyName) |
+ , fLocalStream(NULL) {} |
+ |
+ FontConfigTypeface(Style style, bool fixedWidth, SkStream* localStream) |
+ : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) { |
+ // we default to empty fFamilyName and fIdentity |
+ fLocalStream = localStream; |
+ SkSafeRef(localStream); |
+ } |
+ |
virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; |
virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; |