diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 20:39:57 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 20:39:57 +0000 |
| commit | 2f92966c6a2419023570d5951a4234cdaebcc3c9 (patch) | |
| tree | fdbc8ee6ef7f9ee49e5695eea74b97ea2ff2be3d /include/core/SkDataTable.h | |
| parent | e0e1da34f3c00ec93c61643d4cf4eea6d27c5fef (diff) | |
Remove SkDataTable from SkFlattenable hierarchy.
As far as I can tell, we never really needed this. No code outside the unit
test calls this code.
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/26223009
git-svn-id: http://skia.googlecode.com/svn/trunk@11792 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkDataTable.h')
| -rw-r--r-- | include/core/SkDataTable.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/core/SkDataTable.h b/include/core/SkDataTable.h index cb74c3cb39..9440000e00 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; }; /** |