Index: include/core/SkTypeface.h |
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h |
index 04838dad98d21200596d6a999ad096c8fde9cc84..0be97eb4f7c3a864413c24cfbbbea7bf5edb7c05 100644 |
--- a/include/core/SkTypeface.h |
+++ b/include/core/SkTypeface.h |
@@ -134,21 +134,6 @@ public: |
*/ |
static SkTypeface* Deserialize(SkStream*); |
- /** Retrieve detailed typeface metrics. Used by the PDF backend. |
- @param perGlyphInfo Indicate what glyph specific information (advances, |
- names, etc.) should be populated. |
- @param glyphIDs For per-glyph info, specify subset of the font by |
- giving glyph ids. Each integer represents a glyph |
- id. Passing NULL means all glyphs in the font. |
- @param glyphIDsCount Number of elements in subsetGlyphIds. Ignored if |
- glyphIDs is NULL. |
- @return The returned object has already been referenced. |
- */ |
- SkAdvancedTypefaceMetrics* getAdvancedTypefaceMetrics( |
- SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo, |
- const uint32_t* glyphIDs = NULL, |
- uint32_t glyphIDsCount = 0) const; |
- |
enum Encoding { |
kUTF8_Encoding, |
kUTF16_Encoding, |
@@ -334,6 +319,26 @@ protected: |
size_t length, void* data) const = 0; |
private: |
+ friend class SkGTypeface; |
+ friend class SkPDFFont; |
+ friend class SkPDFCIDFont; |
+ |
+ /** Retrieve detailed typeface metrics. Used by the PDF backend. |
+ @param perGlyphInfo Indicate what glyph specific information (advances, |
+ names, etc.) should be populated. |
+ @param glyphIDs For per-glyph info, specify subset of the font by |
+ giving glyph ids. Each integer represents a glyph |
+ id. Passing NULL means all glyphs in the font. |
+ @param glyphIDsCount Number of elements in subsetGlyphIds. Ignored if |
+ glyphIDs is NULL. |
+ @return The returned object has already been referenced. |
+ */ |
+ SkAdvancedTypefaceMetrics* getAdvancedTypefaceMetrics( |
+ SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo, |
+ const uint32_t* glyphIDs = NULL, |
+ uint32_t glyphIDsCount = 0) const; |
+ |
+private: |
static void create_default_typeface(Style style); |
SkFontID fUniqueID; |