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 --- gm/imagefiltersclipped.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gm/imagefiltersclipped.cpp') diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index 033b80638f..26ee24b1d4 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -57,7 +57,7 @@ protected: paint.setShader(SkGradientShader::MakeRadial(SkPoint::Make(x, y), radius, colors, nullptr, 2, SkShader::kClamp_TileMode)); canvas->drawCircle(x, y, radius, paint); - fGradientCircle.reset(surface->newImageSnapshot()); + fGradientCircle = surface->makeImageSnapshot(); } static void draw_clipped_filter(SkCanvas* canvas, SkImageFilter* filter, size_t i, @@ -80,16 +80,16 @@ protected: } void onOnceBeforeDraw() override { - fCheckerboard.reset(SkImage::NewFromBitmap - (sk_tool_utils::create_checkerboard_bitmap(64, 64, 0xFFA0A0A0, 0xFF404040, 8))); + fCheckerboard = SkImage::MakeFromBitmap + (sk_tool_utils::create_checkerboard_bitmap(64, 64, 0xFFA0A0A0, 0xFF404040, 8)); this->makeGradientCircle(64, 64); } void onDraw(SkCanvas* canvas) override { canvas->clear(SK_ColorBLACK); - SkAutoTUnref gradient(SkImageSource::Create(fGradientCircle)); - SkAutoTUnref checkerboard(SkImageSource::Create(fCheckerboard)); + SkAutoTUnref gradient(SkImageSource::Create(fGradientCircle.get())); + SkAutoTUnref checkerboard(SkImageSource::Create(fCheckerboard.get())); SkAutoTUnref noise(SkPerlinNoiseShader::CreateFractalNoise( SkDoubleToScalar(0.1), SkDoubleToScalar(0.05), 1, 0)); SkMatrix resizeMatrix; @@ -148,7 +148,7 @@ protected: } private: - SkAutoTUnref fCheckerboard, fGradientCircle; + sk_sp fCheckerboard, fGradientCircle; typedef GM INHERITED; }; -- cgit v1.2.3