diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-15 19:52:13 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-15 19:52:13 +0000 |
| commit | e05e75eda103cad9e6727202997ed6e0d88ab183 (patch) | |
| tree | ed2dd198539ad3289ae404b228d86bef4c87d400 /src/fonts | |
| parent | 7bdd614a1940935d3badeb54f7aae75d76ea830d (diff) | |
Update SkGScalerContext to properly forward onCountGlyphs.
git-svn-id: http://skia.googlecode.com/svn/trunk@10090 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkGScalerContext.cpp | 4 | ||||
| -rw-r--r-- | src/fonts/SkGScalerContext.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp index 616932ac98..ab0dce5687 100644 --- a/src/fonts/SkGScalerContext.cpp +++ b/src/fonts/SkGScalerContext.cpp @@ -194,6 +194,10 @@ void SkGTypeface::onGetFontDescriptor(SkFontDescriptor* desc, fProxy->getFontDescriptor(desc, isLocal); } +int SkGTypeface::onCountGlyphs() const { + return fProxy->countGlyphs(); +} + int SkGTypeface::onGetUPEM() const { return fProxy->getUnitsPerEm(); } diff --git a/src/fonts/SkGScalerContext.h b/src/fonts/SkGScalerContext.h index b0a2d8a5d3..b238b0b0a2 100644 --- a/src/fonts/SkGScalerContext.h +++ b/src/fonts/SkGScalerContext.h @@ -29,6 +29,7 @@ protected: virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const SK_OVERRIDE; + virtual int onCountGlyphs() const SK_OVERRIDE; virtual int onGetUPEM() const SK_OVERRIDE; virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; |