clipstacks can be on the stack or embedded, therefore should not be ref-counted

BUG=skia:

Change-Id: I7e16034d463a1db1baac404f775cf33076cbbf73
Reviewed-on: https://skia-review.googlesource.com/9509
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>

diff --git a/src/core/SkClipStack.h b/src/core/SkClipStack.h
index 215e287645ffa79b1b8e388ff057a1a08992764a..e889208f4707e8d84c92571ede8697400c34494a 100644 (file)
--- a/src/core/SkClipStack.h
+++ b/src/core/SkClipStack.h
@@ -29,7 +29,7 @@ class SkCanvasClipVisitor;
 // (i.e., the fSaveCount in force when it was added). Restores are thus
 // implemented by removing clips from fDeque that have an fSaveCount larger
 // then the freshly decremented count.
-class SK_API SkClipStack : public SkNVRefCnt<SkClipStack> {
+class SkClipStack {
 public:
     enum BoundsType {
         // The bounding box contains all the pixels that can be written to

diff --git a/src/gpu/GrClipStackClip.h b/src/gpu/GrClipStackClip.h
index b8c5d17286c2f01a3ec9eb2fdc0072914812062c..660759516dfb52138d065b2c897b0c8bbca838c4 100644 (file)
--- a/src/gpu/GrClipStackClip.h
+++ b/src/gpu/GrClipStackClip.h
@@ -26,7 +26,7 @@ public:
 
     void reset(const SkClipStack* stack = nullptr, const SkIPoint* origin = nullptr) {
         fOrigin = origin ? *origin : SkIPoint::Make(0, 0);
-        fStack.reset(SkSafeRef(stack));
+        fStack = stack;
     }
 
     bool quickContains(const SkRect&) const final;
@@ -62,8 +62,8 @@ private:
                               const GrRenderTargetContext*,
                               const GrReducedClip&);
 
-    SkIPoint                 fOrigin;
-    sk_sp<const SkClipStack> fStack;
+    SkIPoint            fOrigin;
+    const SkClipStack*  fStack;
 };
 
 #endif // GrClipStackClip_DEFINED