diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-14 14:33:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-14 14:33:11 +0000 |
| commit | da30055b296faa5a100e474e0406ef4296c14241 (patch) | |
| tree | 0bcc7d20f3efea9e802b4df6ed1ab13277b2bf33 /src | |
| parent | 9eef56bd3e260a1e6a17640be4a620bf325261e1 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkData.cpp | 26 | ||||
| -rw-r--r-- | src/image/SkDataPixelRef.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 1 |
3 files changed, 4 insertions, 27 deletions
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<void*>(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<SkData>(); + 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<void*>(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) |