| Index: include/core/SkDataTable.h
|
| diff --git a/include/core/SkDataTable.h b/include/core/SkDataTable.h
|
| index cb74c3cb3911ad19adb037079e7971ef064eb1c4..9440000e00b4ce618f4c3ac32aa637aaeff7f0c7 100644
|
| --- a/include/core/SkDataTable.h
|
| +++ b/include/core/SkDataTable.h
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "SkChunkAlloc.h"
|
| #include "SkData.h"
|
| -#include "SkFlattenable.h"
|
| #include "SkString.h"
|
| #include "SkTDArray.h"
|
|
|
| @@ -19,7 +18,7 @@
|
| * organized into a table of entries, each with a length, so the entries are
|
| * not required to all be the same size.
|
| */
|
| -class SK_API SkDataTable : public SkFlattenable {
|
| +class SK_API SkDataTable : public SkRefCnt {
|
| public:
|
| SK_DECLARE_INST_COUNT(SkDataTable)
|
|
|
| @@ -94,12 +93,6 @@ public:
|
| static SkDataTable* NewArrayProc(const void* array, size_t elemSize,
|
| int count, FreeProc proc, void* context);
|
|
|
| - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDataTable)
|
| -
|
| -protected:
|
| - SkDataTable(SkFlattenableReadBuffer&);
|
| - virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
|
| -
|
| private:
|
| struct Dir {
|
| const void* fPtr;
|
| @@ -124,7 +117,7 @@ private:
|
|
|
| friend class SkDataTableBuilder; // access to Dir
|
|
|
| - typedef SkFlattenable INHERITED;
|
| + typedef SkRefCnt INHERITED;
|
| };
|
|
|
| /**
|
|
|