From 8a21c9fe7f5fef9e87115defef27bd7218419f28 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 8 Mar 2016 18:50:00 -0800 Subject: use Make instead of Create to return a shared shader Partially updated call sites. Undefine the flag in SkSHader.h to convert the remaining sites. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1772463002 Review URL: https://codereview.chromium.org/1772463002 --- samplecode/SampleFatBits.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'samplecode/SampleFatBits.cpp') diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp index f3a2f6c54a..4b15e370e4 100644 --- a/samplecode/SampleFatBits.cpp +++ b/samplecode/SampleFatBits.cpp @@ -88,8 +88,7 @@ public: fBounds.set(0, 0, SkIntToScalar(width * zoom), SkIntToScalar(height * zoom)); fMatrix.setScale(SkIntToScalar(zoom), SkIntToScalar(zoom)); fInverse.setScale(SK_Scalar1 / zoom, SK_Scalar1 / zoom); - fShader.reset(sk_tool_utils::create_checkerboard_shader( - 0xFFCCCCCC, 0xFFFFFFFF, zoom)); + fShader = sk_tool_utils::create_checkerboard_shader(0xFFCCCCCC, 0xFFFFFFFF, zoom); SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); fMinSurface.reset(SkSurface::NewRaster(info)); @@ -111,7 +110,7 @@ private: int fW, fH, fZoom; SkMatrix fMatrix, fInverse; SkRect fBounds, fClipRect; - SkAutoTUnref fShader; + sk_sp fShader; SkAutoTUnref fMinSurface; SkAutoTUnref fMaxSurface; -- cgit v1.2.3