diff options
| author |  mtklein <mtklein@chromium.org> | 2015-06-26 11:45:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-26 11:45:03 -0700 |
| commit | 2766c00fc0b6a07d46e5f74cdad45da2ef625237 (patch) | |
| tree | 152a6169021ef393f5719d511becf9f81fec8c02 /include/gpu/GrGpuResource.h | |
| parent | 46043ee50fe0532df6213172506fd16324b21e58 (diff) | |
remove SkInstCnt
It's been outclassed by Valgrind and leak sanitizer,
and it seems to be causing problems for external folks building Skia.
I'm not sure why our own builds seem unaffected.
Latest thread:
https://groups.google.com/forum/#!topic/skia-discuss/oj9FsQwwSF0
BUG=skia:
Review URL: https://codereview.chromium.org/1217573002
Diffstat (limited to 'include/gpu/GrGpuResource.h')
| -rw-r--r-- | include/gpu/GrGpuResource.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h index 6f9855f17c..d726115a72 100644 --- a/include/gpu/GrGpuResource.h +++ b/include/gpu/GrGpuResource.h @@ -11,7 +11,6 @@ #include "GrResourceKey.h" #include "GrTypesPriv.h" #include "SkData.h" -#include "SkInstCnt.h" class GrContext; class GrGpu; @@ -46,8 +45,6 @@ class GrResourceCache; */ template <typename DERIVED> class GrIORef : public SkNoncopyable { public: - SK_DECLARE_INST_COUNT(GrIORef) - // Some of the signatures are written to mirror SkRefCnt so that GrGpuResource can work with // templated helper classes (e.g. SkAutoTUnref). However, we have different categories of // refs (e.g. pending reads). We also don't require thread safety as GrCacheable objects are @@ -59,7 +56,7 @@ public: void unref() const { this->validate(); - + if (!(--fRefCnt)) { if (!static_cast<const DERIVED*>(this)->notifyRefCountIsZero()) { return; @@ -141,7 +138,7 @@ private: */ class SK_API GrGpuResource : public GrIORef<GrGpuResource> { public: - SK_DECLARE_INST_COUNT(GrGpuResource) + enum LifeCycle { /** |