diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-01 20:18:41 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-01 20:18:41 +0000 |
| commit | b10b51f64dbd1cf44571a1eedb412378702d8cd4 (patch) | |
| tree | d961bd1e2de79deff8c50079dce6d3733fc72103 /include/core/SkTypeface.h | |
| parent | 9a43c18740d3251b4d52703a0247719a0aef6474 (diff) | |
Implement onGetTableTags and onGetTableData on Windows.
Implements these and removes default implementation, making the
declaration in SkTypeface pure virtual.
Review URL: https://codereview.chromium.org/20672004/
git-svn-id: http://skia.googlecode.com/svn/trunk@10495 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkTypeface.h')
| -rw-r--r-- | include/core/SkTypeface.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 44abdd3b3a..3cfa6ac3c6 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -22,6 +22,7 @@ class SkAdvancedTypefaceMetrics; class SkWStream; typedef uint32_t SkFontID; +/** Machine endian. */ typedef uint32_t SkFontTableTag; /** \class SkTypeface @@ -294,16 +295,11 @@ protected: virtual int onGetUPEM() const = 0; - virtual int onGetTableTags(SkFontTableTag tags[]) const; + virtual int onGetTableTags(SkFontTableTag tags[]) const = 0; virtual size_t onGetTableData(SkFontTableTag, size_t offset, - size_t length, void* data) const; + size_t length, void* data) const = 0; - // TODO: make this pure-virtual when all ports have overridden it - virtual SkTypeface* onRefMatchingStyle(Style styleBits) const { - SkASSERT(0); - this->ref(); - return const_cast<SkTypeface*>(this); - } + virtual SkTypeface* onRefMatchingStyle(Style styleBits) const = 0; private: SkFontID fUniqueID; |