Index: include/core/SkRefCnt.h |
=================================================================== |
--- include/core/SkRefCnt.h (revision 9702) |
+++ include/core/SkRefCnt.h (working copy) |
@@ -71,16 +71,6 @@ |
SkASSERT(fRefCnt > 0); |
} |
- /** |
- * Alias for ref(), for compatibility with scoped_refptr. |
- */ |
- void AddRef() { this->ref(); } |
- |
- /** |
- * Alias for unref(), for compatibility with scoped_refptr. |
- */ |
- void Release() { this->unref(); } |
- |
protected: |
/** |
* Allow subclasses to call this if they've overridden internal_dispose |
@@ -104,9 +94,10 @@ |
SkDELETE(this); |
} |
+ // The following friends are those which override internal_dispose() |
+ // and conditionally call SkRefCnt::internal_dispose(). |
+ friend class GrTexture; |
friend class SkWeakRefCnt; |
- friend class GrTexture; // to allow GrTexture's internal_dispose to |
- // call SkRefCnt's & directly set fRefCnt (to 1) |
mutable int32_t fRefCnt; |