diff options
| author |  reed <reed@google.com> | 2016-03-18 10:17:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-18 10:17:27 -0700 |
| commit | f28ad894272018fd2855e3f77ea1236ea0cce1c0 (patch) | |
| tree | 25dfb6f13e3bbbde1c9d7af7b41ea39b2df78dd4 /samplecode/ClockFaceView.cpp | |
| parent | 9fbee18f691a0afed1e38a851048ce06063505ed (diff) | |
Revert of switch patheffects over to sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1813553005/ )
Reason for revert:
some build breaks, possibly related to paint having to know what a patheffect is
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/9fbee18f691a0afed1e38a851048ce06063505ed
TBR=caryclark@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1817543002
Diffstat (limited to 'samplecode/ClockFaceView.cpp')
| -rw-r--r-- | samplecode/ClockFaceView.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index f5b43fb82f..11684e11ad 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -132,16 +132,16 @@ private: SkFlattenable* InverseFillPE::CreateProc(SkReadBuffer& buffer) { return new InverseFillPE; } -static sk_sp<SkPathEffect> makepe(float interp, SkTDArray<SkPoint>* pts) { +static 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 sk_make_sp<Dot2DPathEffect>(rad, lattice, pts); + return new Dot2DPathEffect(rad, lattice, pts); } static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p, SkScalar interp) { - p.setPathEffect(makepe(SkScalarToFloat(interp), nullptr)); + p.setPathEffect(makepe(SkScalarToFloat(interp), nullptr))->unref(); 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; - auto pe = makepe(0, &pts); + SkPathEffect* pe = makepe(0, &pts); SkStrokeRec rec(SkStrokeRec::kFill_InitStyle); SkPath path, dstPath; @@ -212,7 +212,8 @@ 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) { |