Index: trunk/include/core/SkTypeface.h |
=================================================================== |
--- trunk/include/core/SkTypeface.h (revision 8138) |
+++ trunk/include/core/SkTypeface.h (working copy) |
@@ -80,6 +80,12 @@ |
*/ |
static bool Equal(const SkTypeface* facea, const SkTypeface* faceb); |
+ /** |
+ * Returns a ref() to the default typeface. The caller must call unref() |
+ * when they are done referencing the object. Never returns NULL. |
+ */ |
+ static SkTypeface* RefDefault(); |
+ |
/** Return a new reference to the typeface that most closely matches the |
requested familyName and style. Pass null as the familyName to return |
the default font for the requested style. Will never return null |
@@ -187,6 +193,8 @@ |
*/ |
int getUnitsPerEm() const; |
+ SkStream* openStream(int* ttcIndex) const; |
+ |
protected: |
/** uniqueID must be unique and non-zero |
*/ |
@@ -209,6 +217,7 @@ |
Style fStyle; |
bool fIsFixedWidth; |
+ friend class SkPaint; |
// just so deprecated fonthost can call protected methods |
friend class SkFontHost; |