From 64f73764b7553148f7660e06b57d623542c63d5b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 8 Dec 2017 10:31:52 -0500 Subject: return data instead of bool Bug: skia: Change-Id: Id7c3044a2fce087703544c624c75a7756b9c62b4 Reviewed-on: https://skia-review.googlesource.com/82602 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/SerialProcsTest.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'tests/SerialProcsTest.cpp') diff --git a/tests/SerialProcsTest.cpp b/tests/SerialProcsTest.cpp index 7368a20c98..6361309b98 100644 --- a/tests/SerialProcsTest.cpp +++ b/tests/SerialProcsTest.cpp @@ -31,31 +31,21 @@ DEF_TEST(serial_procs_image, reporter) { const char magic_str[] = "magic signature"; const SkSerialImageProc sprocs[] = { - [](SkImage* img, SkWStream* stream, void* ctx) { - return false; - }, - [](SkImage* img, SkWStream* stream, void* ctx) { - auto d = img->encodeToData(); - stream->write(d->data(), d->size()); - return true; - }, - [](SkImage* img, SkWStream* stream, void* ctx) { - State* state = (State*)ctx; - stream->write(state->fStr, strlen(state->fStr)); - return true; - }, + [](SkImage* img, void* ctx) -> sk_sp { return nullptr; }, + [](SkImage* img, void* ctx) { return img->encodeToData(); }, + [](SkImage* img, void* ctx) { return SkData::MakeWithCString(((State*)ctx)->fStr); }, }; const SkDeserialImageProc dprocs[] = { [](const void* data, size_t length, void*) -> sk_sp { SK_ABORT("should not get called"); return nullptr; }, - [](const void* data, size_t length, void*) -> sk_sp { + [](const void* data, size_t length, void*) { return SkImage::MakeFromEncoded(SkData::MakeWithCopy(data, length)); }, [](const void* data, size_t length, void* ctx) -> sk_sp { State* state = (State*)ctx; - if (length != strlen(state->fStr) || memcmp(data, state->fStr, length)) { + if (length != strlen(state->fStr)+1 || memcmp(data, state->fStr, length)) { return nullptr; } return sk_ref_sp(state->fImg); -- cgit v1.2.3