diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 20:36:16 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 20:36:16 +0000 |
| commit | e0e1da34f3c00ec93c61643d4cf4eea6d27c5fef (patch) | |
| tree | c16953aa7ea85ae2da0629f6abea640513d3d897 /src | |
| parent | 36c5bdb097f13ede159543a57b7035dbf1f4b3cb (diff) | |
Remove SkColorTable from SkFlattenable hierarchy.
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/27392002
git-svn-id: http://skia.googlecode.com/svn/trunk@11791 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkColorTable.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkMallocPixelRef.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/SkColorTable.cpp b/src/core/SkColorTable.cpp index c117443954..242ea6ba64 100644 --- a/src/core/SkColorTable.cpp +++ b/src/core/SkColorTable.cpp @@ -100,7 +100,7 @@ SkColorTable::SkColorTable(SkFlattenableReadBuffer& buffer) { #endif } -void SkColorTable::flatten(SkFlattenableWriteBuffer& buffer) const { +void SkColorTable::writeToBuffer(SkFlattenableWriteBuffer& buffer) const { buffer.writeUInt(fAlphaType); buffer.writeColorArray(fColors, fCount); } diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp index d700983961..341ac9eb88 100644 --- a/src/core/SkMallocPixelRef.cpp +++ b/src/core/SkMallocPixelRef.cpp @@ -46,7 +46,7 @@ void SkMallocPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const { buffer.writeByteArray(fStorage, fSize); buffer.writeBool(fCTable != NULL); if (fCTable) { - buffer.writeFlattenable(fCTable); + fCTable->writeToBuffer(buffer); } } @@ -56,7 +56,7 @@ SkMallocPixelRef::SkMallocPixelRef(SkFlattenableReadBuffer& buffer) fStorage = sk_malloc_throw(fSize); buffer.readByteArray(fStorage); if (buffer.readBool()) { - fCTable = buffer.readFlattenableT<SkColorTable>(); + fCTable = SkNEW_ARGS(SkColorTable, (buffer)); } else { fCTable = NULL; } diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 82c9680c3c..1c22f23178 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -27,7 +27,6 @@ #include "SkColorFilterImageFilter.h" #include "SkColorMatrixFilter.h" #include "SkColorShader.h" -#include "SkColorTable.h" #include "SkComposeImageFilter.h" #include "SkComposeShader.h" #include "SkCornerPathEffect.h" @@ -70,7 +69,6 @@ void SkFlattenable::InitializeFlattenables() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorTable) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect) |