diff options
| -rw-r--r-- | include/core/SkWriteBuffer.h | 1 | ||||
| -rw-r--r-- | src/core/SkWriteBuffer.cpp | 3 | ||||
| -rw-r--r-- | tests/PaintTest.cpp | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/core/SkWriteBuffer.h b/include/core/SkWriteBuffer.h index 07d6fd1175..bd04dec0f9 100644 --- a/include/core/SkWriteBuffer.h +++ b/include/core/SkWriteBuffer.h @@ -38,7 +38,6 @@ public: return SkToBool(fFlags & kCrossProcess_Flag); } - SkWriter32* getWriter32() { return &fWriter; } void reset(void* storage = NULL, size_t storageSize = 0) { fWriter.reset(storage, storageSize); } diff --git a/src/core/SkWriteBuffer.cpp b/src/core/SkWriteBuffer.cpp index b90a81e631..2b35b67702 100644 --- a/src/core/SkWriteBuffer.cpp +++ b/src/core/SkWriteBuffer.cpp @@ -136,8 +136,7 @@ bool SkWriteBuffer::writeToStream(SkWStream* stream) { static void write_encoded_bitmap(SkWriteBuffer* buffer, SkData* data, const SkIPoint& origin) { - buffer->writeUInt(SkToU32(data->size())); - buffer->getWriter32()->writePad(data->data(), data->size()); + buffer->writeDataAsByteArray(data); buffer->write32(origin.fX); buffer->write32(origin.fY); } diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 253ce86769..9865344947 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -258,8 +258,9 @@ DEF_TEST(Paint_flattening, reporter) { SkWriteBuffer writer; paint.flatten(writer); - const uint32_t* written = writer.getWriter32()->contiguousArray(); - SkReadBuffer reader(written, writer.bytesWritten()); + SkAutoMalloc buf(writer.bytesWritten()); + writer.writeToMemory(buf.get()); + SkReadBuffer reader(buf.get(), writer.bytesWritten()); SkPaint paint2; paint2.unflatten(reader); @@ -297,7 +298,10 @@ DEF_TEST(Paint_MoreFlattening, r) { SkWriteBuffer writer; paint.flatten(writer); - SkReadBuffer reader(writer.getWriter32()->contiguousArray(), writer.bytesWritten()); + SkAutoMalloc buf(writer.bytesWritten()); + writer.writeToMemory(buf.get()); + SkReadBuffer reader(buf.get(), writer.bytesWritten()); + SkPaint other; other.unflatten(reader); ASSERT(reader.offset() == writer.bytesWritten()); |