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/ImageGeneratorTest.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/ImageGeneratorTest.cpp')
-rw-r--r-- | tests/ImageGeneratorTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index 3d750b2c73..63a47e46b1 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -19,21 +19,21 @@ static SkImageGenerator* my_factory(SkData*) { static void test_imagegenerator_factory(skiatest::Reporter* reporter) { // just need a non-empty data to test things - SkAutoTUnref<SkData> data(SkData::NewWithCString("test_imagegenerator_factory")); + sk_sp<SkData> data(SkData::MakeWithCString("test_imagegenerator_factory")); gMyFactoryWasCalled = false; SkImageGenerator* gen; REPORTER_ASSERT(reporter, !gMyFactoryWasCalled); - gen = SkImageGenerator::NewFromEncoded(data); + gen = SkImageGenerator::NewFromEncoded(data.get()); REPORTER_ASSERT(reporter, nullptr == gen); REPORTER_ASSERT(reporter, !gMyFactoryWasCalled); // Test is racy, in that it hopes no other thread is changing this global... SkGraphics::ImageGeneratorFromEncodedFactory prev = SkGraphics::SetImageGeneratorFromEncodedFactory(my_factory); - gen = SkImageGenerator::NewFromEncoded(data); + gen = SkImageGenerator::NewFromEncoded(data.get()); REPORTER_ASSERT(reporter, nullptr == gen); REPORTER_ASSERT(reporter, gMyFactoryWasCalled); SkGraphics::SetImageGeneratorFromEncodedFactory(prev); |