SkData need not be a Flattenable, since it does not need subclass/factories

include/core/SkData.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef SkData_DEFINED
 #define SkData_DEFINED
 
-#include "SkFlattenable.h"
+#include "SkRefCnt.h"
 
 struct SkFILE;
 
 /**
  *  SkData holds an immutable data buffer. Not only is the data immutable,
  *  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)
 
     /**
      *  Returns the number of bytes stored.
      */
     size_t size() const { return fSize; }
 
     bool isEmpty() const { return 0 == fSize; }
 
@@ skipping 85 matching lines @@
      *  src dataref.
      */
     static SkData* NewSubset(const SkData* src, size_t offset, size_t length);
 
     /**
      *  Returns a new empty dataref (or a reference to a shared empty dataref).
      *  New or shared, the caller must see that unref() is eventually called.
      */
     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;
 
     const void* fPtr;
     size_t      fSize;
 
     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. */
 typedef SkAutoTUnref<SkData> SkAutoDataUnref;
 
 #endif