From b4c899d48d4c5d8e867beb611551f7b55ec60abb Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 29 Apr 2016 13:58:09 -0700 Subject: remove SkWriteBuffer::getWriter32(). SkWriteBuffer exposes its lower-level implementation SkWriter32 through this one call. It's not currently used in any interesting way: - write_encoded_bitmap() uses it to manually re-create writeDataAsByteArray(); - unit tests use it incidentally as a quick way to read the serialized bytes. This should be SkWriteBuffer no longer necessarily needs to have an SkWriter32. Landing this will let us then remove SkWriter32::contiguousArray(). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1936563002 TBR=reed@google.com Just deleting API Review-Url: https://codereview.chromium.org/1936563002 --- tests/PaintTest.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/PaintTest.cpp') 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()); -- cgit v1.2.3