From da30055b296faa5a100e474e0406ef4296c14241 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 14 Oct 2013 14:33:11 +0000 Subject: 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@11754 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkData.cpp | 26 ++------------------------ src/image/SkDataPixelRef.cpp | 4 ++-- src/ports/SkGlobalInitialization_default.cpp | 1 - 3 files changed, 4 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp index a1b42b0c4f..f5d983e0ed 100644 --- a/src/core/SkData.cpp +++ b/src/core/SkData.cpp @@ -158,28 +158,6 @@ SkData* SkData::NewWithCString(const char cstr[]) { /////////////////////////////////////////////////////////////////////////////// -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(fPtr)); -} - -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// - #include "SkDataSet.h" #include "SkFlattenable.h" #include "SkStream.h" @@ -283,7 +261,7 @@ void SkDataSet::flatten(SkFlattenableWriteBuffer& buffer) const { 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 @@ SkDataSet::SkDataSet(SkFlattenableReadBuffer& buffer) { for (int i = 0; i < fCount; ++i) { fPairs[i].fKey = keyStorage; keyStorage += strlen(keyStorage) + 1; - fPairs[i].fValue = buffer.readFlattenableT(); + fPairs[i].fValue = buffer.readByteArrayAsData(); } } else { fKeySize = 0; diff --git a/src/image/SkDataPixelRef.cpp b/src/image/SkDataPixelRef.cpp index 980b4f1451..0524243366 100644 --- a/src/image/SkDataPixelRef.cpp +++ b/src/image/SkDataPixelRef.cpp @@ -29,11 +29,11 @@ void SkDataPixelRef::onUnlockPixels() { 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(fData->data()), NULL); } diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 8a70381f40..2e98a02f25 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -77,7 +77,6 @@ void SkFlattenable::InitializeFlattenables() { 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) -- cgit v1.2.3