| Index: include/core/SkData.h
|
| diff --git a/include/core/SkData.h b/include/core/SkData.h
|
| index 6f883c884387480a305ede19bf1ff8556e5d1652..c244cb8a927163f8e17e891994d81d4bd033ed2b 100644
|
| --- a/include/core/SkData.h
|
| +++ b/include/core/SkData.h
|
| @@ -11,7 +11,7 @@
|
| #ifndef SkData_DEFINED
|
| #define SkData_DEFINED
|
|
|
| -#include "SkFlattenable.h"
|
| +#include "SkRefCnt.h"
|
|
|
| struct SkFILE;
|
|
|
| @@ -20,7 +20,7 @@ struct SkFILE;
|
| * but the actual ptr that is returned (by data() or bytes()) is guaranteed
|
| * to always be the same for the life of this instance.
|
| */
|
| -class SK_API SkData : public SkFlattenable {
|
| +class SK_API SkData : public SkRefCnt {
|
| public:
|
| SK_DECLARE_INST_COUNT(SkData)
|
|
|
| @@ -126,12 +126,6 @@ public:
|
| */
|
| static SkData* NewEmpty();
|
|
|
| - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkData)
|
| -
|
| -protected:
|
| - SkData(SkFlattenableReadBuffer&);
|
| - virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
|
| -
|
| private:
|
| ReleaseProc fReleaseProc;
|
| void* fReleaseProcContext;
|
| @@ -142,7 +136,7 @@ private:
|
| SkData(const void* ptr, size_t size, ReleaseProc, void* context);
|
| virtual ~SkData();
|
|
|
| - typedef SkFlattenable INHERITED;
|
| + typedef SkRefCnt INHERITED;
|
| };
|
|
|
| /** Typedef of SkAutoTUnref<SkData> for automatically unref-ing a SkData. */
|
|
|