commit 6f5ccc5ae4ec53a129afcc9bb1dd4b22e03e10db
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 14 14:33:11 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 14 14:33:11 2013 +0000
tree a7264bcec26e72d9445700506d9ab0cc3542fcb5
parent a425a0ed0b7d5e34dddeff405613ca9d84f0b4f3

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

BUG=
R=mtklein@google.com

Review URL: https://codereview.chromium.org/26928002

git-svn-id: http://skia.googlecode.com/svn/trunk/src@11754 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkData.cpp

diff --git a/core/SkData.cpp b/core/SkData.cpp
index a1b42b0..f5d983e 100644
--- a/core/SkData.cpp
+++ b/core/SkData.cpp
@@ -158,28 +158,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-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"
@@ -283,7 +261,7 @@
     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);
         }
     }
 }
@@ -320,7 +298,7 @@
         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;

image/SkDataPixelRef.cpp

diff --git a/image/SkDataPixelRef.cpp b/image/SkDataPixelRef.cpp
index 980b4f1..0524243 100644
--- a/image/SkDataPixelRef.cpp
+++ b/image/SkDataPixelRef.cpp
@@ -29,11 +29,11 @@
 
 void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-    buffer.writeFlattenable(fData);
+    buffer.writeDataAsByteArray(fData);
 }
 
 SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer, NULL) {
-    fData = (SkData*)buffer.readFlattenable();
+    fData = buffer.readByteArrayAsData();
     this->setPreLocked(const_cast<void*>(fData->data()), NULL);
 }

ports/SkGlobalInitialization_default.cpp

diff --git a/ports/SkGlobalInitialization_default.cpp b/ports/SkGlobalInitialization_default.cpp
index 8a70381..2e98a02 100644
--- a/ports/SkGlobalInitialization_default.cpp
+++ b/ports/SkGlobalInitialization_default.cpp
@@ -77,7 +77,6 @@
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkData)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDataSet)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)