Use SkNVRefCnt for a couple common types.

These types are ref-counted, but don't otherwise need a vtable.
This makes them good candidates for SkNVRefCnt.

Destruction can be a little more direct, and if nothing else,
sizeof(T) will get a little smaller by dropping the vptr.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2232433002

Review-Url: https://codereview.chromium.org/2232433002

diff --git a/include/core/SkData.h b/include/core/SkData.h
index 546b77d..76c9c9e 100644 (file)
--- a/include/core/SkData.h
+++ b/include/core/SkData.h
@@ -19,7 +19,7 @@ class SkStream;
  *  but the actual ptr that is returned (by data() or bytes()) is guaranteed
  *  to always be the same for the life of this instance.
  */
-class SK_API SkData : public SkRefCnt {
+class SK_API SkData final : public SkNVRefCnt<SkData> {
 public:
     /**
      *  Returns the number of bytes stored.
@@ -79,7 +79,7 @@ public:
      */
     static sk_sp<SkData> MakeWithCopy(const void* data, size_t length);
 
-    
+
     /**
      *  Create a new data with uninitialized contents. The caller should call writable_data()
      *  to write into the buffer, but this must be done before another ref() is made.
@@ -158,6 +158,7 @@ public:
     static sk_sp<SkData> MakeEmpty();
 
 private:
+    friend class SkNVRefCnt<SkData>;
     ReleaseProc fReleaseProc;
     void*       fReleaseProcContext;
     void*       fPtr;
@@ -165,7 +166,7 @@ private:
 
     SkData(const void* ptr, size_t size, ReleaseProc, void* context);
     explicit SkData(size_t size);   // inplace new/delete
-    virtual ~SkData();
+    ~SkData();
 
 
     // Objects of this type are sometimes created in a custom fashion using sk_malloc_throw and

diff --git a/include/core/SkPathRef.h b/include/core/SkPathRef.h
index 344e705..f84697f 100644 (file)
--- a/include/core/SkPathRef.h
+++ b/include/core/SkPathRef.h
@@ -36,7 +36,7 @@ class SkWBuffer;
  * logical verb or the last verb in memory).
  */
 
-class SK_API SkPathRef : public ::SkRefCnt {
+class SK_API SkPathRef final : public SkNVRefCnt<SkPathRef> {
 public:
     class Editor {
     public:
@@ -243,7 +243,7 @@ public:
      */
     static void Rewind(SkAutoTUnref<SkPathRef>* pathRef);
 
-    virtual ~SkPathRef();
+    ~SkPathRef();
     int countPoints() const { SkDEBUGCODE(this->validate();) return fPointCnt; }
     int countVerbs() const { SkDEBUGCODE(this->validate();) return fVerbCnt; }
     int countWeights() const { SkDEBUGCODE(this->validate();) return fConicWeights.count(); }
@@ -543,7 +543,6 @@ private:
 
     friend class PathRefTest_Private;
     friend class ForceIsRRect_Private; // unit test isRRect
-    typedef SkRefCnt INHERITED;
 };
 
 #endif

diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h
index c211f85..3c5d873 100644 (file)
--- a/include/core/SkTextBlob.h
+++ b/include/core/SkTextBlob.h
@@ -19,7 +19,7 @@ class SkWriteBuffer;
 
     SkTextBlob combines multiple text runs into an immutable, ref-counted structure.
 */
-class SK_API SkTextBlob : public SkRefCnt {
+class SK_API SkTextBlob final : public SkNVRefCnt<SkTextBlob> {
 public:
     /**
      *  Returns a conservative blob bounding box.
@@ -52,11 +52,12 @@ public:
     };
 
 private:
+    friend class SkNVRefCnt<SkTextBlob>;
     class RunRecord;
 
     SkTextBlob(int runCount, const SkRect& bounds);
 
-    virtual ~SkTextBlob();
+    ~SkTextBlob();
 
     // Memory for objects of this class is created with sk_malloc rather than operator new and must
     // be freed with sk_free.

diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp
index 74f3a22..06a1519 100644 (file)
--- a/src/core/SkPathRef.cpp
+++ b/src/core/SkPathRef.cpp
@@ -675,7 +675,6 @@ uint8_t SkPathRef::Iter::peek() const {
 
 #ifdef SK_DEBUG
 void SkPathRef::validate() const {
-    this->INHERITED::validate();
     SkASSERT(static_cast<ptrdiff_t>(fFreeSpace) >= 0);
     SkASSERT(reinterpret_cast<intptr_t>(fVerbs) - reinterpret_cast<intptr_t>(fPoints) >= 0);
     SkASSERT((nullptr == fPoints) == (nullptr == fVerbs));