diff options
author | reed <reed@google.com> | 2016-03-21 13:25:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 13:25:16 -0700 |
commit | 7b380d0d0e91ae6967c52bfa14853a77b9551de4 (patch) | |
tree | e76ea25f431624e01b51ca605761438fd4560120 /gm/megalooper.cpp | |
parent | dc6c9bf91c158e89cd9d5ef19dfbf1da98c598a6 (diff) |
guard rasterizer and drawlooper setters
Need to land https://codereview.chromium.org/1823513002/ first
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1821533002
Review URL: https://codereview.chromium.org/1821533002
Diffstat (limited to 'gm/megalooper.cpp')
-rw-r--r-- | gm/megalooper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/megalooper.cpp b/gm/megalooper.cpp index ae92971982..5fe9af298b 100644 --- a/gm/megalooper.cpp +++ b/gm/megalooper.cpp @@ -131,7 +131,7 @@ private: for (int i = 0; i < 4; ++i) { SkPaint loopPaint; - loopPaint.setLooper(create1Looper(-kOffsetToOutsideClip, 0, gColors[i]))->unref(); + loopPaint.setLooper(create1Looper(-kOffsetToOutsideClip, 0, gColors[i])); loopPaint.setAntiAlias(true); SkRect outerClip = { @@ -161,7 +161,7 @@ private: } // Create a 1-tier drawlooper - SkLayerDrawLooper* create1Looper(SkScalar xOff, SkScalar yOff, SkColor color) { + sk_sp<SkDrawLooper> create1Looper(SkScalar xOff, SkScalar yOff, SkColor color) { SkLayerDrawLooper::Builder looperBuilder; SkLayerDrawLooper::LayerInfo info; @@ -178,7 +178,7 @@ private: SkColorFilter* cf = SkColorFilter::CreateModeFilter(color, SkXfermode::kSrcIn_Mode); paint->setColorFilter(cf)->unref(); - return looperBuilder.detachLooper(); + return looperBuilder.detach(); } void draw1x4(SkCanvas* canvas, SkScalar x, SkScalar y) { @@ -193,7 +193,7 @@ private: SkPaint paint; paint.setAntiAlias(true); - paint.setLooper(create4Looper(-kOffsetToOutsideClip-kHalfSquareSize, 0))->unref(); + paint.setLooper(create4Looper(-kOffsetToOutsideClip-kHalfSquareSize, 0)); canvas->save(); canvas->clipRect(outerClip, SkRegion::kIntersect_Op); @@ -205,7 +205,7 @@ private: } // Create a 4-tier draw looper - SkLayerDrawLooper* create4Looper(SkScalar xOff, SkScalar yOff) { + sk_sp<SkDrawLooper> create4Looper(SkScalar xOff, SkScalar yOff) { SkLayerDrawLooper::Builder looperBuilder; SkLayerDrawLooper::LayerInfo info; @@ -226,7 +226,7 @@ private: paint->setColorFilter(cf)->unref(); } - return looperBuilder.detachLooper(); + return looperBuilder.detach(); } typedef GM INHERITED; |