Index: include/core/SkTypeface.h |
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h |
index e3a311da4337eae9429185104225db62bed07ccb..4f3879c6c295d2a46fe53972efd29df0361ffe64 100644 |
--- a/include/core/SkTypeface.h |
+++ b/include/core/SkTypeface.h |
@@ -188,7 +188,7 @@ public: |
* from the beginning of chars. This value is valid, even if the |
* glyphs parameter is NULL. |
*/ |
- int charsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], |
+ int charsToGlyphs(const void* chars, Encoding encoding, SkGlyphID glyphs[], |
int glyphCount) const; |
/** |
@@ -262,7 +262,7 @@ public: |
* array will be in an undefined state (possibly some values may have been |
* written, but none of them should be interpreted as valid values). |
*/ |
- bool getKerningPairAdjustments(const uint16_t glyphs[], int count, |
+ bool getKerningPairAdjustments(const SkGlyphID glyphs[], int count, |
int32_t adjustments[]) const; |
struct LocalizedString { |
@@ -364,12 +364,12 @@ protected: |
virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0; |
- virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[], |
+ virtual int onCharsToGlyphs(const void* chars, Encoding, SkGlyphID glyphs[], |
int glyphCount) const = 0; |
virtual int onCountGlyphs() const = 0; |
virtual int onGetUPEM() const = 0; |
- virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count, |
+ virtual bool onGetKerningPairAdjustments(const SkGlyphID glyphs[], int count, |
int32_t adjustments[]) const; |
/** Returns the family name of the typeface as known by its font manager. |