| Index: include/core/SkColorTable.h
|
| diff --git a/include/core/SkColorTable.h b/include/core/SkColorTable.h
|
| index c6e31b94d421e7f7c18ea2f458640b70bc62b719..8a21258697d5b8f9b1e50385af6f19f6f80a519f 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
|
|
|