diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 20:36:16 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 20:36:16 +0000 |
commit | e0e1da34f3c00ec93c61643d4cf4eea6d27c5fef (patch) | |
tree | c16953aa7ea85ae2da0629f6abea640513d3d897 /include/core/SkColorTable.h | |
parent | 36c5bdb097f13ede159543a57b7035dbf1f4b3cb (diff) |
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@11791 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkColorTable.h')
-rw-r--r-- | include/core/SkColorTable.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/core/SkColorTable.h b/include/core/SkColorTable.h index c6e31b94d4..8a21258697 100644 --- a/include/core/SkColorTable.h +++ b/include/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 @@ public: 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 @@ private: void inval16BitCache(); - typedef SkFlattenable INHERITED; + typedef SkRefCnt INHERITED; }; #endif |