diff options
author | Ben Wagner <bungeman@google.com> | 2016-11-03 14:40:50 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 19:03:40 +0000 |
commit | 145dbcd165d9d27298eb8888bc240e2d06a95464 (patch) | |
tree | 461ac2a3fe607bdf1d72fd72ae9451a58490a1bc /tests/StreamTest.cpp | |
parent | b1c7f88df9ec40b4efb52d314304adfbaf95697c (diff) |
Remove SkAutoTDelete.
Replace with std::unique_ptr.
Change-Id: I5806cfbb30515fcb20e5e66ce13fb5f3b8728176
Reviewed-on: https://skia-review.googlesource.com/4381
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tests/StreamTest.cpp')
-rw-r--r-- | tests/StreamTest.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index 74e60557d1..ca750d1566 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -61,7 +61,7 @@ static void test_filestreams(skiatest::Reporter* reporter, const char* tmpDir) { REPORTER_ASSERT(reporter, stream.isValid()); test_loop_stream(reporter, &stream, s, 26, 100); - SkAutoTDelete<SkStreamAsset> stream2(stream.duplicate()); + std::unique_ptr<SkStreamAsset> stream2(stream.duplicate()); test_loop_stream(reporter, stream2.get(), s, 26, 100); } @@ -71,7 +71,7 @@ static void test_filestreams(skiatest::Reporter* reporter, const char* tmpDir) { REPORTER_ASSERT(reporter, stream.isValid()); test_loop_stream(reporter, &stream, s, 26, 100); - SkAutoTDelete<SkStreamAsset> stream2(stream.duplicate()); + std::unique_ptr<SkStreamAsset> stream2(stream.duplicate()); test_loop_stream(reporter, stream2.get(), s, 26, 100); } } @@ -94,15 +94,15 @@ static void TestWStream(skiatest::Reporter* reporter) { } { - SkAutoTDelete<SkStreamAsset> stream(ds.detachAsStream()); + std::unique_ptr<SkStreamAsset> stream(ds.detachAsStream()); REPORTER_ASSERT(reporter, 100 * 26 == stream->getLength()); REPORTER_ASSERT(reporter, ds.getOffset() == 0); test_loop_stream(reporter, stream.get(), s, 26, 100); - SkAutoTDelete<SkStreamAsset> stream2(stream->duplicate()); + std::unique_ptr<SkStreamAsset> stream2(stream->duplicate()); test_loop_stream(reporter, stream2.get(), s, 26, 100); - SkAutoTDelete<SkStreamAsset> stream3(stream->fork()); + std::unique_ptr<SkStreamAsset> stream3(stream->fork()); REPORTER_ASSERT(reporter, stream3->isAtEnd()); char tmp; size_t bytes = stream->read(&tmp, 1); @@ -124,11 +124,11 @@ static void TestWStream(skiatest::Reporter* reporter) { { // Test that this works after a snapshot. - SkAutoTDelete<SkStreamAsset> stream(ds.detachAsStream()); + std::unique_ptr<SkStreamAsset> stream(ds.detachAsStream()); REPORTER_ASSERT(reporter, ds.getOffset() == 0); test_loop_stream(reporter, stream.get(), s, 26, 100); - SkAutoTDelete<SkStreamAsset> stream2(stream->duplicate()); + std::unique_ptr<SkStreamAsset> stream2(stream->duplicate()); test_loop_stream(reporter, stream2.get(), s, 26, 100); } delete[] dst; @@ -234,12 +234,12 @@ static void test_peeking_front_buffered_stream(skiatest::Reporter* r, size_t bufferSize) { SkStream* dupe = original.duplicate(); REPORTER_ASSERT(r, dupe != nullptr); - SkAutoTDelete<SkStream> bufferedStream(SkFrontBufferedStream::Create(dupe, bufferSize)); + std::unique_ptr<SkStream> bufferedStream(SkFrontBufferedStream::Create(dupe, bufferSize)); REPORTER_ASSERT(r, bufferedStream != nullptr); size_t peeked = 0; for (size_t i = 1; !bufferedStream->isAtEnd(); i++) { - const size_t unpeekableBytes = compare_peek_to_read(r, bufferedStream, i); + const size_t unpeekableBytes = compare_peek_to_read(r, bufferedStream.get(), i); if (unpeekableBytes > 0) { // This could not have returned a number greater than i. REPORTER_ASSERT(r, unpeekableBytes <= i); @@ -359,7 +359,7 @@ DEF_TEST(StreamPeek_BlockMemoryStream, rep) { } dynamicMemoryWStream.write(buffer, size); } - SkAutoTDelete<SkStreamAsset> asset(dynamicMemoryWStream.detachAsStream()); + std::unique_ptr<SkStreamAsset> asset(dynamicMemoryWStream.detachAsStream()); sk_sp<SkData> expected(SkData::MakeUninitialized(asset->getLength())); uint8_t* expectedPtr = static_cast<uint8_t*>(expected->writable_data()); valueSource.setSeed(kSeed); // reseed. @@ -369,7 +369,7 @@ DEF_TEST(StreamPeek_BlockMemoryStream, rep) { for (size_t i = 0; i < asset->getLength(); ++i) { expectedPtr[i] = valueSource.nextU() & 0xFF; } - stream_peek_test(rep, asset, expected.get()); + stream_peek_test(rep, asset.get(), expected.get()); } namespace { @@ -429,6 +429,6 @@ DEF_TEST(StreamCopy, reporter) { DEF_TEST(StreamEmptyStreamMemoryBase, r) { SkDynamicMemoryWStream tmp; - SkAutoTDelete<SkStreamAsset> asset(tmp.detachAsStream()); + std::unique_ptr<SkStreamAsset> asset(tmp.detachAsStream()); REPORTER_ASSERT(r, nullptr == asset->getMemoryBase()); } |