diff options
Diffstat (limited to 'chromium/third_party/skia/include/core/SkTypeface.h')
| -rw-r--r-- | chromium/third_party/skia/include/core/SkTypeface.h | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/chromium/third_party/skia/include/core/SkTypeface.h b/chromium/third_party/skia/include/core/SkTypeface.h index d873e69b9d0..0b1c1f24ac7 100644 --- a/chromium/third_party/skia/include/core/SkTypeface.h +++ b/chromium/third_party/skia/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,29 @@ 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 SkTypeface* CreateDefault(int style); // SkLazyPtr requires an int, not a Style. + static void DeleteDefault(SkTypeface*); + SkFontID fUniqueID; Style fStyle; bool fIsFixedPitch; |