Revert of switch patheffects over to sk_sp

include/core/SkPathEffect.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkPathEffect_DEFINED
 #define SkPathEffect_DEFINED
 
 #include "SkFlattenable.h"
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkRect.h"
 
 class SkPath;
 class SkStrokeRec;
 
-#ifndef SK_SUPPORT_LEGACY_PATHEFFECT_PTR
-    #define SK_SUPPORT_LEGACY_PATHEFFECT_PTR
-#endif
-
 /** \class SkPathEffect
 
     SkPathEffect is the base class for objects in the SkPaint that affect
     the geometry of a drawing primitive before it is transformed by the
     canvas' matrix and drawn.
 
     Dashing is implemented as a subclass of SkPathEffect.
 */
 class SK_API SkPathEffect : public SkFlattenable {
 public:
@@ skipping 116 matching lines @@
     typedef SkFlattenable INHERITED;
 };
 
 /** \class SkPairPathEffect
 
     Common baseclass for Compose and Sum. This subclass manages two pathEffects,
     including flattening them. It does nothing in filterPath, and is only useful
     for managing the lifetimes of its two arguments.
 */
 class SkPairPathEffect : public SkPathEffect {
+public:
+    virtual ~SkPairPathEffect();
+
 protected:
-    SkPairPathEffect(sk_sp<SkPathEffect> pe0, sk_sp<SkPathEffect> pe1);
+    SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1);
 
     void flatten(SkWriteBuffer&) const override;
 
     // these are visible to our subclasses
-    sk_sp<SkPathEffect> fPE0;
-    sk_sp<SkPathEffect> fPE1;
+    SkPathEffect* fPE0, *fPE1;
 
     SK_TO_STRING_OVERRIDE()
 
 private:
     typedef SkPathEffect INHERITED;
 };
 
 /** \class SkComposePathEffect
 
     This subclass of SkPathEffect composes its two arguments, to create
     a compound pathEffect.
 */
 class SkComposePathEffect : public SkPairPathEffect {
 public:
     /** Construct a pathEffect whose effect is to apply first the inner pathEffect
         and the the outer pathEffect (e.g. outer(inner(path)))
         The reference counts for outer and inner are both incremented in the constructor,
         and decremented in the destructor.
     */
-    static sk_sp<SkPathEffect> Make(sk_sp<SkPathEffect> outer, sk_sp<SkPathEffect> inner) {
+    static SkPathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) {
         if (!outer) {
-            return inner;
+            return SkSafeRef(inner);
         }
         if (!inner) {
-            return outer;
+            return SkSafeRef(outer);
         }
-        return sk_sp<SkPathEffect>(new SkComposePathEffect(outer, inner));
+        return new SkComposePathEffect(outer, inner);
     }
 
-#ifdef SK_SUPPORT_LEGACY_PATHEFFECT_PTR
-    static SkPathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) {
-        return Make(sk_ref_sp(outer), sk_ref_sp(inner)).release();
-    }
-#endif
-
     virtual bool filterPath(SkPath* dst, const SkPath& src,
                             SkStrokeRec*, const SkRect*) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect)
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     bool exposedInAndroidJavaAPI() const override { return true; }
 #endif
 
 protected:
-    SkComposePathEffect(sk_sp<SkPathEffect> outer, sk_sp<SkPathEffect> inner)
-        : INHERITED(outer, inner) {}
+    SkComposePathEffect(SkPathEffect* outer, SkPathEffect* inner) : INHERITED(outer, inner) {}
 
 private:
     // illegal
     SkComposePathEffect(const SkComposePathEffect&);
     SkComposePathEffect& operator=(const SkComposePathEffect&);
 
     typedef SkPairPathEffect INHERITED;
 };
 
 /** \class SkSumPathEffect
 
     This subclass of SkPathEffect applies two pathEffects, one after the other.
     Its filterPath() returns true if either of the effects succeeded.
 */
 class SkSumPathEffect : public SkPairPathEffect {
 public:
     /** Construct a pathEffect whose effect is to apply two effects, in sequence.
         (e.g. first(path) + second(path))
         The reference counts for first and second are both incremented in the constructor,
         and decremented in the destructor.
     */
-    static sk_sp<SkPathEffect> Make(sk_sp<SkPathEffect> first, sk_sp<SkPathEffect> second) {
+    static SkPathEffect* Create(SkPathEffect* first, SkPathEffect* second) {
         if (!first) {
-            return second;
+            return SkSafeRef(second);
         }
         if (!second) {
-            return first;
+            return SkSafeRef(first);
         }
-        return sk_sp<SkPathEffect>(new SkSumPathEffect(first, second));
+        return new SkSumPathEffect(first, second);
     }
 
-#ifdef SK_SUPPORT_LEGACY_PATHEFFECT_PTR
-    static SkPathEffect* Create(SkPathEffect* first, SkPathEffect* second) {
-        return Make(sk_ref_sp(first), sk_ref_sp(second)).release();
-    }
-#endif
     virtual bool filterPath(SkPath* dst, const SkPath& src,
                             SkStrokeRec*, const SkRect*) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect)
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     bool exposedInAndroidJavaAPI() const override { return true; }
 #endif
 
 protected:
-    SkSumPathEffect(sk_sp<SkPathEffect> first, sk_sp<SkPathEffect> second)
-        : INHERITED(first, second) {}
+    SkSumPathEffect(SkPathEffect* first, SkPathEffect* second) : INHERITED(first, second) {}
 
 private:
     // illegal
     SkSumPathEffect(const SkSumPathEffect&);
     SkSumPathEffect& operator=(const SkSumPathEffect&);
 
     typedef SkPairPathEffect INHERITED;
 };
 
 #endif