From 9ce9d6772df650ceb0511f275e1a83dffa78ff72 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 17 Mar 2016 10:51:11 -0700 Subject: update callsites for Make image factories not forced yet, as we still have the build-guard. waiting on chrome CL BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003 TBR= Review URL: https://codereview.chromium.org/1810813003 --- tests/SkResourceCacheTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/SkResourceCacheTest.cpp') diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp index f9a0e6d505..625b98a903 100644 --- a/tests/SkResourceCacheTest.cpp +++ b/tests/SkResourceCacheTest.cpp @@ -263,7 +263,7 @@ DEF_TEST(BitmapCache_discarded_bitmap, reporter) { } static void test_discarded_image(skiatest::Reporter* reporter, const SkMatrix& transform, - SkImage* (*buildImage)()) { + sk_sp (*buildImage)()) { SkAutoTUnref surface(SkSurface::NewRasterN32Premul(10, 10)); SkCanvas* canvas = surface->getCanvas(); @@ -273,7 +273,7 @@ static void test_discarded_image(skiatest::Reporter* reporter, const SkMatrix& t for (unsigned i = 0; i < kRepeatCount; ++i) { SkAutoCanvasRestore acr(canvas, true); - SkAutoTUnref image(buildImage()); + sk_sp image(buildImage()); // always use high quality to ensure caching when scaled SkPaint paint; @@ -315,15 +315,15 @@ DEF_TEST(BitmapCache_discarded_image, reporter) { test_discarded_image(reporter, xforms[i], []() { SkAutoTUnref surface(SkSurface::NewRasterN32Premul(10, 10)); surface->getCanvas()->clear(SK_ColorCYAN); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); }); test_discarded_image(reporter, xforms[i], []() { SkPictureRecorder recorder; SkCanvas* canvas = recorder.beginRecording(10, 10); canvas->clear(SK_ColorCYAN); - SkAutoTUnref picture(recorder.endRecording()); - return SkImage::NewFromPicture(picture, SkISize::Make(10, 10), nullptr, nullptr); + sk_sp picture(recorder.endRecording()); + return SkImage::MakeFromPicture(picture, SkISize::Make(10, 10), nullptr, nullptr); }); } } -- cgit v1.2.3