From 98c5d92ee60f6d395f9591891922aa9852a497ee Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 15 Sep 2017 21:39:47 -0400 Subject: Revert "Revert "use unique_ptr for stream api"" This reverts commit 7031b247c9fe0cb8fa32129f9bc24fea2043cee2. Bug: skia: Change-Id: I24c34bbee703f02994be8e206bcb9c10b5427d84 Reviewed-on: https://skia-review.googlesource.com/47541 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/StreamTest.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/StreamTest.cpp') diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index 8b5b2ae05a..2e8078e337 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -227,9 +227,9 @@ static void test_fully_peekable_stream(skiatest::Reporter* r, SkStream* stream, static void test_peeking_front_buffered_stream(skiatest::Reporter* r, const SkStream& original, size_t bufferSize) { - SkStream* dupe = original.duplicate(); + std::unique_ptr dupe(original.duplicate()); REPORTER_ASSERT(r, dupe != nullptr); - std::unique_ptr bufferedStream(SkFrontBufferedStream::Create(dupe, bufferSize)); + auto bufferedStream = SkFrontBufferedStream::Make(std::move(dupe), bufferSize); REPORTER_ASSERT(r, bufferedStream != nullptr); size_t peeked = 0; @@ -249,7 +249,11 @@ static void test_peeking_front_buffered_stream(skiatest::Reporter* r, } // Test that attempting to peek beyond the length of the buffer does not prevent rewinding. +#ifdef SK_SUPPORT_LEGACY_STREAM_API bufferedStream.reset(SkFrontBufferedStream::Create(original.duplicate(), bufferSize)); +#else + bufferedStream = SkFrontBufferedStream::Make(original.duplicate(), bufferSize); +#endif REPORTER_ASSERT(r, bufferedStream != nullptr); const size_t bytesToPeek = bufferSize + 1; -- cgit v1.2.3