diff options
| author |  reed <reed@google.com> | 2016-03-08 18:50:00 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-08 18:50:00 -0800 |
| commit | 8a21c9fe7f5fef9e87115defef27bd7218419f28 (patch) | |
| tree | 1dd8b9eda9eae99b33bc88b97bd5f0a7a0769dc3 /samplecode/SampleFatBits.cpp | |
| parent | 042f859c19f71ca9feacddd1cb058ff59eed8963 (diff) | |
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
Diffstat (limited to 'samplecode/SampleFatBits.cpp')
| -rw-r--r-- | samplecode/SampleFatBits.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<SkShader> fShader; + sk_sp<SkShader> fShader; SkAutoTUnref<SkSurface> fMinSurface; SkAutoTUnref<SkSurface> fMaxSurface; |