commit d4de8e36a06b66f6104ce523648915be5dd1d345
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 20:36:16 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 20:36:16 2013 +0000
tree dc773d6a159197899f26095e224a2188d123f64f
parent 6b33c7a2dbbeeca3a5eb85dae0ab3b48b1fb8bae

Remove SkColorTable from SkFlattenable hierarchy.

BUG=
R=reed@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/27392002

git-svn-id: http://skia.googlecode.com/svn/trunk/include@11791 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkColorTable.h

diff --git a/core/SkColorTable.h b/core/SkColorTable.h
index c6e31b9..8a21258 100644
--- a/core/SkColorTable.h
+++ b/core/SkColorTable.h
@@ -19,7 +19,7 @@
     SkColorTable holds an array SkPMColors (premultiplied 32-bit colors) used by
     8-bit bitmaps, where the bitmap bytes are interpreted as indices into the colortable.
 */
-class SkColorTable : public SkFlattenable {
+class SkColorTable : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkColorTable)
 
@@ -75,11 +75,8 @@
         SkDEBUGCODE(f16BitCacheLockCount -= 1);
     }
 
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorTable)
-
-protected:
     explicit SkColorTable(SkFlattenableReadBuffer&);
-    void flatten(SkFlattenableWriteBuffer&) const;
+    void writeToBuffer(SkFlattenableWriteBuffer&) const;
 
 private:
     SkPMColor*  fColors;
@@ -91,7 +88,7 @@
 
     void inval16BitCache();
 
-    typedef SkFlattenable INHERITED;
+    typedef SkRefCnt INHERITED;
 };
 
 #endif