diff options
| author |  bungeman <bungeman@google.com> | 2016-08-02 14:40:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-02 14:40:46 -0700 |
| commit | 38d909ec2875f79952de08f36adfaac5680d2c53 (patch) | |
| tree | a11067146b42f3faa8531d6ef912f7246bbde1f2 /tests/StreamTest.cpp | |
| parent | ada5a44f3bdac10a8a0c53b34f5add7aea9fdbb0 (diff) | |
Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.
This moves Skia code off of SK_SUPPORT_LEGACY_DATA_FACTORIES.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2206633004
Review-Url: https://codereview.chromium.org/2206633004
Diffstat (limited to 'tests/StreamTest.cpp')
| -rw-r--r-- | tests/StreamTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index fe4da0f5fb..50523ff317 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -174,7 +174,7 @@ static void TestPackedUInt(skiatest::Reporter* reporter) { static void TestDereferencingData(SkMemoryStream* memStream) { memStream->read(nullptr, 0); memStream->getMemoryBase(); - SkAutoDataUnref data(memStream->copyToData()); + sk_sp<SkData> data(memStream->copyToData()); } static void TestNullData() { @@ -361,7 +361,7 @@ DEF_TEST(StreamPeek_BlockMemoryStream, rep) { dynamicMemoryWStream.write(buffer, size); } SkAutoTDelete<SkStreamAsset> asset(dynamicMemoryWStream.detachAsStream()); - SkAutoTUnref<SkData> expected(SkData::NewUninitialized(asset->getLength())); + sk_sp<SkData> expected(SkData::MakeUninitialized(asset->getLength())); uint8_t* expectedPtr = static_cast<uint8_t*>(expected->writable_data()); valueSource.setSeed(kSeed); // reseed. // We want the exact same same "random" string of numbers to put @@ -370,7 +370,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); + stream_peek_test(rep, asset, expected.get()); } namespace { |