diff options
| author | reed <reed@google.com> | 2016-03-18 10:00:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 10:00:32 -0700 |
| commit | 9fbee18f691a0afed1e38a851048ce06063505ed (patch) | |
| tree | cd647dad4bae251bbbadea7fdd85b8a4b22cecc7 /samplecode/ClockFaceView.cpp | |
| parent | 1195260e22fc2e9c92b435491d4d19108a20df5c (diff) | |
switch patheffects over to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1813553005
Review URL: https://codereview.chromium.org/1813553005
Diffstat (limited to 'samplecode/ClockFaceView.cpp')
| -rw-r--r-- | samplecode/ClockFaceView.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 11684e11ad..f5b43fb82f 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -132,16 +132,16 @@ private: SkFlattenable* InverseFillPE::CreateProc(SkReadBuffer& buffer) { return new InverseFillPE; } -static SkPathEffect* makepe(float interp, SkTDArray<SkPoint>* pts) { +static sk_sp<SkPathEffect> makepe(float interp, SkTDArray<SkPoint>* pts) { SkMatrix lattice; SkScalar rad = 3 + SkIntToScalar(4) * (1 - interp); lattice.setScale(rad*2, rad*2, 0, 0); lattice.postSkew(SK_Scalar1/3, 0, 0, 0); - return new Dot2DPathEffect(rad, lattice, pts); + return sk_make_sp<Dot2DPathEffect>(rad, lattice, pts); } static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p, SkScalar interp) { - p.setPathEffect(makepe(SkScalarToFloat(interp), nullptr))->unref(); + p.setPathEffect(makepe(SkScalarToFloat(interp), nullptr)); rastBuilder->addLayer(p); #if 0 p.setPathEffect(new InverseFillPE())->unref(); @@ -201,7 +201,7 @@ protected: static void drawdots(SkCanvas* canvas, const SkPaint& orig) { SkTDArray<SkPoint> pts; - SkPathEffect* pe = makepe(0, &pts); + auto pe = makepe(0, &pts); SkStrokeRec rec(SkStrokeRec::kFill_InitStyle); SkPath path, dstPath; @@ -212,8 +212,7 @@ protected: p.setAntiAlias(true); p.setStrokeWidth(10); p.setColor(SK_ColorRED); - canvas->drawPoints(SkCanvas::kPoints_PointMode, pts.count(), pts.begin(), - p); + canvas->drawPoints(SkCanvas::kPoints_PointMode, pts.count(), pts.begin(), p); } virtual void onDraw(SkCanvas* canvas) { |