change flattenable factory to return sk_sp

src/core/SkPathEffect.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPathEffect.h"
 #include "SkPath.h"
 #include "SkReadBuffer.h"
@@ skipping 39 matching lines @@
     }
     str->appendf(" second: ");
     if (fPE1) {
         fPE1->toString(str);
     }
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkFlattenable* SkComposePathEffect::CreateProc(SkReadBuffer& buffer) {
+sk_sp<SkFlattenable> SkComposePathEffect::CreateProc(SkReadBuffer& buffer) {
     sk_sp<SkPathEffect> pe0(buffer.readPathEffect());
     sk_sp<SkPathEffect> pe1(buffer.readPathEffect());
-    return SkComposePathEffect::Make(std::move(pe0), std::move(pe1)).release();
+    return SkComposePathEffect::Make(std::move(pe0), std::move(pe1));
 }
 
 bool SkComposePathEffect::filterPath(SkPath* dst, const SkPath& src,
                              SkStrokeRec* rec, const SkRect* cullRect) const {
     SkPath          tmp;
     const SkPath*   ptr = &src;
 
     if (fPE1->filterPath(&tmp, src, rec, cullRect)) {
         ptr = &tmp;
     }
     return fPE0->filterPath(dst, *ptr, rec, cullRect);
 }
 
 
 #ifndef SK_IGNORE_TO_STRING
 void SkComposePathEffect::toString(SkString* str) const {
     str->appendf("SkComposePathEffect: (");
     this->INHERITED::toString(str);
     str->appendf(")");
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkFlattenable* SkSumPathEffect::CreateProc(SkReadBuffer& buffer) {
+sk_sp<SkFlattenable> SkSumPathEffect::CreateProc(SkReadBuffer& buffer) {
     sk_sp<SkPathEffect> pe0(buffer.readPathEffect());
     sk_sp<SkPathEffect> pe1(buffer.readPathEffect());
-    return SkSumPathEffect::Make(pe0, pe1).release();
+    return SkSumPathEffect::Make(pe0, pe1);
 }
 
 bool SkSumPathEffect::filterPath(SkPath* dst, const SkPath& src,
                              SkStrokeRec* rec, const SkRect* cullRect) const {
     // use bit-or so that we always call both, even if the first one succeeds
     return fPE0->filterPath(dst, src, rec, cullRect) |
            fPE1->filterPath(dst, src, rec, cullRect);
 }
 
 
 #ifndef SK_IGNORE_TO_STRING
 void SkSumPathEffect::toString(SkString* str) const {
     str->appendf("SkSumPathEffect: (");
     this->INHERITED::toString(str);
     str->appendf(")");
 }
 #endif