diff options
author | reed <reed@google.com> | 2016-03-23 18:59:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 18:59:25 -0700 |
commit | e8f3062a36d3682f4019309a32b5b84dc9eddf8c (patch) | |
tree | ff5cd50c65edb6e3b77f77327165ad0162557137 /tests/ImageIsOpaqueTest.cpp | |
parent | 041c870425eb0a3e2b0cbc46581b3da2f50571d9 (diff) |
switch surface to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1817383002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1817383002
Diffstat (limited to 'tests/ImageIsOpaqueTest.cpp')
-rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 6f13708335..6b8b64ac21 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -48,18 +48,19 @@ DEF_TEST(ImageInfo_flattening, reporter) { } } -static void check_isopaque(skiatest::Reporter* reporter, SkSurface* surface, bool expectedOpaque) { +static void check_isopaque(skiatest::Reporter* reporter, const sk_sp<SkSurface>& surface, + bool expectedOpaque) { sk_sp<SkImage> image(surface->makeImageSnapshot()); REPORTER_ASSERT(reporter, image->isOpaque() == expectedOpaque); } DEF_TEST(ImageIsOpaqueTest, reporter) { SkImageInfo infoTransparent = SkImageInfo::MakeN32Premul(5, 5); - SkAutoTUnref<SkSurface> surfaceTransparent(SkSurface::NewRaster(infoTransparent)); + auto surfaceTransparent(SkSurface::MakeRaster(infoTransparent)); check_isopaque(reporter, surfaceTransparent, false); SkImageInfo infoOpaque = SkImageInfo::MakeN32(5, 5, kOpaque_SkAlphaType); - SkAutoTUnref<SkSurface> surfaceOpaque(SkSurface::NewRaster(infoOpaque)); + auto surfaceOpaque(SkSurface::MakeRaster(infoOpaque)); check_isopaque(reporter, surfaceOpaque, true); } @@ -67,13 +68,11 @@ DEF_TEST(ImageIsOpaqueTest, reporter) { DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageIsOpaqueTest_Gpu, reporter, context) { SkImageInfo infoTransparent = SkImageInfo::MakeN32Premul(5, 5); - SkAutoTUnref<SkSurface> surfaceTransparent( - SkSurface::NewRenderTarget(context, SkBudgeted::kNo, infoTransparent)); + auto surfaceTransparent(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, infoTransparent)); check_isopaque(reporter, surfaceTransparent, false); SkImageInfo infoOpaque = SkImageInfo::MakeN32(5, 5, kOpaque_SkAlphaType); - SkAutoTUnref<SkSurface> surfaceOpaque( - SkSurface::NewRenderTarget(context,SkBudgeted::kNo, infoOpaque)); + auto surfaceOpaque(SkSurface::MakeRenderTarget(context,SkBudgeted::kNo, infoOpaque)); check_isopaque(reporter, surfaceOpaque, true); } |