diff options
| author |  halcanary <halcanary@google.com> | 2016-07-25 07:18:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-25 07:18:12 -0700 |
| commit | d0e95a524c20932e0f4e68bab43995188a281395 (patch) | |
| tree | 7077702ee7d4e3d7deffcbe10f70ba4ff53fe50f /include/core/SkTypeface.h | |
| parent | 1d35231e7b5cce8c4f54ea71a8e030be893363fb (diff) | |
typedef uint16_t SkGlyphID
This goes well with our existing `typedef int32_t SkUnichar`.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2095263003
Review-Url: https://codereview.chromium.org/2095263003
Diffstat (limited to 'include/core/SkTypeface.h')
| -rw-r--r-- | include/core/SkTypeface.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index e3a311da43..4f3879c6c2 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. |