From 145dbcd165d9d27298eb8888bc240e2d06a95464 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 3 Nov 2016 14:40:50 -0400 Subject: Remove SkAutoTDelete. Replace with std::unique_ptr. Change-Id: I5806cfbb30515fcb20e5e66ce13fb5f3b8728176 Reviewed-on: https://skia-review.googlesource.com/4381 Commit-Queue: Ben Wagner Reviewed-by: Mike Klein --- tests/FrontBufferedStreamTest.cpp | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'tests/FrontBufferedStreamTest.cpp') diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp index 445f0bf4c9..a3862741e3 100644 --- a/tests/FrontBufferedStreamTest.cpp +++ b/tests/FrontBufferedStreamTest.cpp @@ -56,70 +56,70 @@ static void test_incremental_buffering(skiatest::Reporter* reporter, size_t buff // deleted yet (and we only call const methods in it). SkMemoryStream* memStream = new SkMemoryStream(gAbcs, strlen(gAbcs), false); - SkAutoTDelete bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); - test_hasLength(reporter, *bufferedStream.get(), *memStream); + std::unique_ptr bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); + test_hasLength(reporter, *bufferedStream, *memStream); // First, test reading less than the max buffer size. - test_read(reporter, bufferedStream, gAbcs, bufferSize / 2); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize / 2); // Now test rewinding back to the beginning and reading less than what was // already buffered. - test_rewind(reporter, bufferedStream, true); - test_read(reporter, bufferedStream, gAbcs, bufferSize / 4); + test_rewind(reporter, bufferedStream.get(), true); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize / 4); // Now test reading part of what was buffered, and buffering new data. - test_read(reporter, bufferedStream, gAbcs + bufferSize / 4, bufferSize / 2); + test_read(reporter, bufferedStream.get(), gAbcs + bufferSize / 4, bufferSize / 2); // Now test reading what was buffered, buffering new data, and // reading directly from the stream. - test_rewind(reporter, bufferedStream, true); - test_read(reporter, bufferedStream, gAbcs, bufferSize << 1); + test_rewind(reporter, bufferedStream.get(), true); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize << 1); // We have reached the end of the buffer, so rewinding will fail. // This test assumes that the stream is larger than the buffer; otherwise the // result of rewind should be true. - test_rewind(reporter, bufferedStream, false); + test_rewind(reporter, bufferedStream.get(), false); } static void test_perfectly_sized_buffer(skiatest::Reporter* reporter, size_t bufferSize) { SkMemoryStream* memStream = new SkMemoryStream(gAbcs, strlen(gAbcs), false); - SkAutoTDelete bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); - test_hasLength(reporter, *bufferedStream.get(), *memStream); + std::unique_ptr bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); + test_hasLength(reporter, *bufferedStream, *memStream); // Read exactly the amount that fits in the buffer. - test_read(reporter, bufferedStream, gAbcs, bufferSize); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize); // Rewinding should succeed. - test_rewind(reporter, bufferedStream, true); + test_rewind(reporter, bufferedStream.get(), true); // Once again reading buffered info should succeed - test_read(reporter, bufferedStream, gAbcs, bufferSize); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize); // Read past the size of the buffer. At this point, we cannot return. - test_read(reporter, bufferedStream, gAbcs + memStream->getPosition(), 1); - test_rewind(reporter, bufferedStream, false); + test_read(reporter, bufferedStream.get(), gAbcs + memStream->getPosition(), 1); + test_rewind(reporter, bufferedStream.get(), false); } static void test_skipping(skiatest::Reporter* reporter, size_t bufferSize) { SkMemoryStream* memStream = new SkMemoryStream(gAbcs, strlen(gAbcs), false); - SkAutoTDelete bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); - test_hasLength(reporter, *bufferedStream.get(), *memStream); + std::unique_ptr bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); + test_hasLength(reporter, *bufferedStream, *memStream); // Skip half the buffer. bufferedStream->skip(bufferSize / 2); // Rewind, then read part of the buffer, which should have been read. - test_rewind(reporter, bufferedStream, true); - test_read(reporter, bufferedStream, gAbcs, bufferSize / 4); + test_rewind(reporter, bufferedStream.get(), true); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize / 4); // Now skip beyond the buffered piece, but still within the total buffer. bufferedStream->skip(bufferSize / 2); // Test that reading will still work. - test_read(reporter, bufferedStream, gAbcs + memStream->getPosition(), bufferSize / 4); + test_read(reporter, bufferedStream.get(), gAbcs + memStream->getPosition(), bufferSize / 4); - test_rewind(reporter, bufferedStream, true); - test_read(reporter, bufferedStream, gAbcs, bufferSize); + test_rewind(reporter, bufferedStream.get(), true); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize); } // A custom class whose isAtEnd behaves the way Android's stream does - since it is an adaptor to a @@ -156,7 +156,7 @@ static void test_read_beyond_buffer(skiatest::Reporter* reporter, size_t bufferS new AndroidLikeMemoryStream((void*)gAbcs, bufferSize, false); // Create a buffer that matches the length of the stream. - SkAutoTDelete bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); + std::unique_ptr bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); test_hasLength(reporter, *bufferedStream.get(), *memStream); // Attempt to read one more than the bufferSize @@ -164,7 +164,7 @@ static void test_read_beyond_buffer(skiatest::Reporter* reporter, size_t bufferS test_rewind(reporter, bufferedStream.get(), true); // Ensure that the initial read did not invalidate the buffer. - test_read(reporter, bufferedStream, gAbcs, bufferSize); + test_read(reporter, bufferedStream.get(), gAbcs, bufferSize); } // Dummy stream that optionally has a length and/or position. Tests that FrontBufferedStream's @@ -203,7 +203,7 @@ static void test_length_combos(skiatest::Reporter* reporter, size_t bufferSize) for (int hasPos = 0; hasPos <= 1; hasPos++) { LengthOptionalStream* stream = new LengthOptionalStream(SkToBool(hasLen), SkToBool(hasPos)); - SkAutoTDelete buffered(SkFrontBufferedStream::Create(stream, bufferSize)); + std::unique_ptr buffered(SkFrontBufferedStream::Create(stream, bufferSize)); test_hasLength(reporter, *buffered.get(), *stream); } } @@ -217,7 +217,7 @@ static void test_initial_offset(skiatest::Reporter* reporter, size_t bufferSize) // the stream it wraps. const size_t arbitraryOffset = 17; memStream->skip(arbitraryOffset); - SkAutoTDelete bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); + std::unique_ptr bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); // Since SkMemoryStream has a length, bufferedStream must also. REPORTER_ASSERT(reporter, bufferedStream->hasLength()); @@ -231,7 +231,7 @@ static void test_initial_offset(skiatest::Reporter* reporter, size_t bufferSize) // Importantly, the end should not have been reached until currentPosition == bufferedLength. while (currentPosition < bufferedLength) { REPORTER_ASSERT(reporter, !bufferedStream->isAtEnd()); - test_read(reporter, bufferedStream, gAbcs + arbitraryOffset + currentPosition, + test_read(reporter, bufferedStream.get(), gAbcs + arbitraryOffset + currentPosition, amountToRead); currentPosition = SkTMin(currentPosition + amountToRead, bufferedLength); REPORTER_ASSERT(reporter, memStream->getPosition() - arbitraryOffset == currentPosition); @@ -281,9 +281,9 @@ private: DEF_TEST(ShortFrontBufferedStream, reporter) { FailingStream* failingStream = new FailingStream; - SkAutoTDelete stream(SkFrontBufferedStream::Create(failingStream, 64)); + std::unique_ptr stream(SkFrontBufferedStream::Create(failingStream, 64)); // This will fail to create a codec. However, what we really want to test is that we // won't read past the end of the stream. - SkAutoTDelete codec(SkCodec::NewFromStream(stream.release())); + std::unique_ptr codec(SkCodec::NewFromStream(stream.release())); } -- cgit v1.2.3