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/ImageTest.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/ImageTest.cpp')
| -rw-r--r-- | tests/ImageTest.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index ce3cb99265..15ee54c000 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -62,13 +62,13 @@ static void draw_image_test_pattern(SkCanvas* canvas) { } static sk_sp<SkImage> create_image() { const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType); - SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); + auto surface(SkSurface::MakeRaster(info)); draw_image_test_pattern(surface->getCanvas()); return surface->makeImageSnapshot(); } static sk_sp<SkImage> create_image_565() { const SkImageInfo info = SkImageInfo::Make(20, 20, kRGB_565_SkColorType, kOpaque_SkAlphaType); - SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); + auto surface(SkSurface::MakeRaster(info)); draw_image_test_pattern(surface->getCanvas()); return surface->makeImageSnapshot(); } @@ -146,8 +146,7 @@ static sk_sp<SkImage> create_codec_image() { #if SK_SUPPORT_GPU static sk_sp<SkImage> create_gpu_image(GrContext* context) { const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType); - SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkBudgeted::kNo, - info)); + auto surface(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info)); draw_image_test_pattern(surface->getCanvas()); return surface->makeImageSnapshot(); } @@ -224,7 +223,7 @@ DEF_TEST(Image_Encode_Serializer, reporter) { // Test that image encoding failures do not break picture serialization/deserialization. DEF_TEST(Image_Serialize_Encoding_Failure, reporter) { - SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(100, 100)); + auto surface(SkSurface::MakeRasterN32Premul(100, 100)); surface->getCanvas()->clear(SK_ColorGREEN); sk_sp<SkImage> image(surface->makeImageSnapshot()); REPORTER_ASSERT(reporter, image); @@ -287,7 +286,7 @@ DEF_TEST(Image_RetainSnapshot, reporter) { const SkPMColor red = SkPackARGB32(0xFF, 0xFF, 0, 0); const SkPMColor green = SkPackARGB32(0xFF, 0, 0xFF, 0); SkImageInfo info = SkImageInfo::MakeN32Premul(2, 2); - SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); + auto surface(SkSurface::MakeRaster(info)); surface->getCanvas()->clear(0xFF00FF00); SkPMColor pixels[4]; @@ -373,7 +372,7 @@ DEF_GPUTEST_FOR_NATIVE_CONTEXT(SkImage_Gpu2Cpu, reporter, context) { sk_sp<SkImage> image(create_gpu_image(context)); const uint32_t uniqueID = image->uniqueID(); - SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); + auto surface(SkSurface::MakeRaster(info)); // now we can test drawing a gpu-backed image into a cpu-backed surface |