commit 2981906f142c986620ddc401165186cb8afba143
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 01 22:29:43 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 01 22:29:43 2013 +0000
tree 07c662ff94a92e2e3a6da06b481d0b11932b3196
parent cd8f89c884d3acf8e7ae0a4d272dec6af45f2b7e

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/include@10500 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkTypeface.h

diff --git a/core/SkTypeface.h b/core/SkTypeface.h
index 44abdd3..3cfa6ac 100644
--- a/core/SkTypeface.h
+++ b/core/SkTypeface.h
@@ -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;