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 /src/effects/SkDashPathEffect.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 'src/effects/SkDashPathEffect.cpp')
| -rw-r--r-- | src/effects/SkDashPathEffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index 51bf54839c..3816499915 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -365,7 +365,7 @@ SkFlattenable* SkDashPathEffect::CreateProc(SkReadBuffer& buffer) { uint32_t count = buffer.getArrayCount(); SkAutoSTArray<32, SkScalar> intervals(count); if (buffer.readScalarArray(intervals.get(), count)) { - return Make(intervals.get(), SkToInt(count), phase).release(); + return Create(intervals.get(), SkToInt(count), phase); } return nullptr; } @@ -386,9 +386,9 @@ void SkDashPathEffect::toString(SkString* str) const { ////////////////////////////////////////////////////////////////////////////////////////////////// -sk_sp<SkPathEffect> SkDashPathEffect::Make(const SkScalar intervals[], int count, SkScalar phase) { +SkPathEffect* SkDashPathEffect::Create(const SkScalar intervals[], int count, SkScalar phase) { if (!SkDashPath::ValidDashPath(phase, intervals, count)) { return nullptr; } - return sk_sp<SkPathEffect>(new SkDashPathEffect(intervals, count, phase)); + return new SkDashPathEffect(intervals, count, phase); } |