AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow users to build on top of, instead of beneath, SkRefCnt.

Browse Source 
Alternative to r11811.

The Chromium half of this can be seen at https://codereview.chromium.org/40973002/ .

R=reed@google.com

Review URL: https://codereview.chromium.org/40503002

git-svn-id: http://skia.googlecode.com/svn/trunk@11967 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2013-10-25 18:40:24 +00:00
parent 5003bde3f8
commit 10ba006631
2 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/core/SkRefCnt.h
View File

@ -14,25 +14,9 @@
#include "SkInstCnt.h"
#include "SkTemplates.h"
#ifdef SK_REF_CNT_BASE_INCLUDE
#include SK_REF_CNT_BASE_INCLUDE
#else
/** \class SkRefCntBase
Default implementation of SkRefCntBase. The base class' contract is to
provide an implementation of aboutToRef. Embedders of skia can specify
an alternate implementation by setting SK_REF_CNT_BASE_INCLUDE. This is
useful for adding debug run-time checks to enforce certain usage patterns.
*/
class SK_API SkRefCntBase {
public:
void aboutToRef() const {}
};
#endif
/** \class SkRefCnt
SkRefCnt is the base class for objects that may be shared by multiple
SkRefCntBase is the base class for objects that may be shared by multiple
objects. When an existing owner wants to share a reference, it calls ref().
When an owner wants to release its reference, it calls unref(). When the
shared object's reference count goes to zero as the result of an unref()
@ -40,17 +24,17 @@ public:
destructor to be called explicitly (or via the object going out of scope on
the stack or calling delete) if getRefCnt() > 1.
*/
class SK_API SkRefCnt : public SkRefCntBase {
class SK_API SkRefCntBase : public SkNoncopyable {
public:
SK_DECLARE_INST_COUNT_ROOT(SkRefCnt)
SK_DECLARE_INST_COUNT_ROOT(SkRefCntBase)
/** Default construct, initializing the reference count to 1.
*/
SkRefCnt() : fRefCnt(1) {}
SkRefCntBase() : fRefCnt(1) {}
/** Destruct, asserting that the reference count is 1.
*/
virtual ~SkRefCnt() {
virtual ~SkRefCntBase() {
#ifdef SK_DEBUG
SkASSERT(fRefCnt == 1);
fRefCnt = 0; // illegal value, to catch us if we reuse after delete
@ -77,7 +61,6 @@ public:
*/
void ref() const {
SkASSERT(fRefCnt > 0);
this->INHERITED::aboutToRef();
sk_atomic_inc(&fRefCnt); // No barrier required.
}
@ -102,11 +85,6 @@ public:
}
#endif
/**
* Alias for unref(), for compatibility with WTF::RefPtr.
*/
void deref() { this->unref(); }
protected:
/**
* Allow subclasses to call this if they've overridden internal_dispose
@ -122,12 +100,6 @@ protected:
}
private:
/**
* Make SkRefCnt non-copyable.
*/
SkRefCnt(const SkRefCnt&);
SkRefCnt& operator=(const SkRefCnt&);
/**
* Called when the ref count goes to 0.
*/
@ -143,9 +115,17 @@ private:
mutable int32_t fRefCnt;
typedef SkRefCntBase INHERITED;
typedef SkNoncopyable INHERITED;
};
#ifdef SK_REF_CNT_MIXIN_INCLUDE
// It is the responsibility of the following include to define the type SkRefCnt.
// This SkRefCnt should normally derive from SkRefCntBase.
#include SK_REF_CNT_MIXIN_INCLUDE
#else
class SK_API SkRefCnt : public SkRefCntBase { };
#endif
///////////////////////////////////////////////////////////////////////////////
/** Helper macro to safely assign one SkRefCnt[TS]* to another, checking for

7
src/core/SkRefCnt.cpp
View File

@ -9,10 +9,5 @@
#include "SkRefCnt.h"
#include "SkWeakRefCnt.h"
SK_DEFINE_INST_COUNT(SkRefCnt)
SK_DEFINE_INST_COUNT(SkRefCntBase)
SK_DEFINE_INST_COUNT(SkWeakRefCnt)
#ifdef SK_BUILD_FOR_WIN
SkRefCnt::SkRefCnt(const SkRefCnt&) { }
SkRefCnt& SkRefCnt::operator=(const SkRefCnt&) { return *this; }
#endif