| Index: include/core/SkTypeface.h
|
| ===================================================================
|
| --- include/core/SkTypeface.h (revision 10497)
|
| +++ include/core/SkTypeface.h (working copy)
|
| @@ -22,6 +22,7 @@
|
| class SkWStream;
|
|
|
| typedef uint32_t SkFontID;
|
| +/** Machine endian. */
|
| typedef uint32_t SkFontTableTag;
|
|
|
| /** \class SkTypeface
|
| @@ -294,16 +295,11 @@
|
|
|
| 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;
|
|
|