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

src/core/SkData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkFlattenableBuffers.h"
 #include "SkOSFile.h"
@@ skipping 140 matching lines @@
         cstr = "";
         size = 1;
     } else {
         size = strlen(cstr) + 1;
     }
     return NewWithCopy(cstr, size);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkData::flatten(SkFlattenableWriteBuffer& buffer) const {
-    buffer.writeByteArray(fPtr, fSize);
-}
-
-SkData::SkData(SkFlattenableReadBuffer& buffer) {
-    fSize = buffer.getArrayCount();
-    fReleaseProcContext = NULL;
-
-    if (fSize > 0) {
-        fPtr = sk_malloc_throw(fSize);
-        fReleaseProc = sk_free_releaseproc;
-    } else {
-        fPtr = NULL;
-        fReleaseProc = NULL;
-    }
-
-    buffer.readByteArray(const_cast<void*>(fPtr));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
 #include "SkDataSet.h"
 #include "SkFlattenable.h"
 #include "SkStream.h"
 
 static SkData* dupdata(SkData* data) {
     if (data) {
         data->ref();
     } else {
         data = SkData::NewEmpty();
     }
@@ skipping 83 matching lines @@
             stream->writeData(fPairs[i].fValue);
         }
     }
 }
 
 void SkDataSet::flatten(SkFlattenableWriteBuffer& buffer) const {
     buffer.writeInt(fCount);
     if (fCount > 0) {
         buffer.writeByteArray(fPairs[0].fKey, fKeySize);
         for (int i = 0; i < fCount; ++i) {
-            buffer.writeFlattenable(fPairs[i].fValue);
+            buffer.writeDataAsByteArray(fPairs[i].fValue);
         }
     }
 }
 
 SkDataSet::SkDataSet(SkStream* stream) {
     fCount = stream->readU32();
     if (fCount > 0) {
         fKeySize = stream->readU32();
         fPairs = allocatePairStorage(fCount, fKeySize);
         char* keyStorage = (char*)(fPairs + fCount);
@@ skipping 16 matching lines @@
     if (fCount > 0) {
         fKeySize = buffer.getArrayCount();
         fPairs = allocatePairStorage(fCount, fKeySize);
         char* keyStorage = (char*)(fPairs + fCount);
 
         buffer.readByteArray(keyStorage);
 
         for (int i = 0; i < fCount; ++i) {
             fPairs[i].fKey = keyStorage;
             keyStorage += strlen(keyStorage) + 1;
-            fPairs[i].fValue = buffer.readFlattenableT<SkData>();
+            fPairs[i].fValue = buffer.readByteArrayAsData();
         }
     } else {
         fKeySize = 0;
         fPairs = NULL;
     }
 }
 
 SkDataSet* SkDataSet::NewEmpty() {
     static SkDataSet* gEmptySet;
     if (NULL == gEmptySet) {
         gEmptySet = SkNEW_ARGS(SkDataSet, (NULL, 0));
     }
     gEmptySet->ref();
     return gEmptySet;
 }