commit 4d73ac22a1b99402fc8cff78a4eb4b27aa8fe019
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jun 13 18:54:08 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jun 13 18:54:08 2012 +0000
tree e12e9be96cdc105dfc275ee9ada6982d81d3e4fb
parent 972265db219ce25b5159879c75e6c62efaf0fa79

Version 2 of the Instance Counting system. This one simplifies the print out of information.

http://codereview.appspot.com/6296069/



git-svn-id: http://skia.googlecode.com/svn/trunk@4255 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrAARectRenderer.cpp

diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 3eca362..a771532 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -9,7 +9,7 @@
 #include "GrRefCnt.h"
 #include "GrGpu.h"
 
-DEFINE_INST_COUNT(GrAARectRenderer)
+SK_DEFINE_INST_COUNT(GrAARectRenderer)
 
 namespace {
 

src/gpu/GrPathRendererChain.cpp

diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index 00f0b81..648225e 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -13,6 +13,8 @@
 #include "GrDefaultPathRenderer.h"
 #include "GrGpu.h"
 
+SK_DEFINE_INST_COUNT(GrPathRendererChain)
+
 GrPathRendererChain::GrPathRendererChain(GrContext* context, UsageFlags flags)
     : fInit(false)
     , fOwner(context)

src/gpu/GrPathRendererChain.h

diff --git a/src/gpu/GrPathRendererChain.h b/src/gpu/GrPathRendererChain.h
index 529b4cb..e5ccabb 100644
--- a/src/gpu/GrPathRendererChain.h
+++ b/src/gpu/GrPathRendererChain.h
@@ -27,6 +27,7 @@
  */
 class GrPathRendererChain : public SkRefCnt {
 public:
+    SK_DECLARE_INST_COUNT(GrPathRendererChain)
 
     enum UsageFlags {
         kNone_UsageFlag      = 0,
@@ -58,6 +59,8 @@
     GrContext*                                          fOwner;
     UsageFlags                                          fFlags;
     SkSTArray<kPreAllocCount, GrPathRenderer*, true>    fChain;
+
+    typedef SkRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrPathRendererChain::UsageFlags)

src/gpu/GrRenderTarget.cpp

diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp
index be08444..071c885 100644
--- a/src/gpu/GrRenderTarget.cpp
+++ b/src/gpu/GrRenderTarget.cpp
@@ -13,6 +13,8 @@
 #include "GrGpu.h"
 #include "GrStencilBuffer.h"
 
+SK_DEFINE_INST_COUNT(GrRenderTarget)
+
 bool GrRenderTarget::readPixels(int left, int top, int width, int height,
                                 GrPixelConfig config, void* buffer,
                                 size_t rowBytes) {

src/gpu/GrResource.cpp

diff --git a/src/gpu/GrResource.cpp b/src/gpu/GrResource.cpp
index a5168c8..7e2d4a8 100644
--- a/src/gpu/GrResource.cpp
+++ b/src/gpu/GrResource.cpp
@@ -10,7 +10,7 @@
 #include "GrResource.h"
 #include "GrGpu.h"
 
-DEFINE_INST_COUNT(GrResource)
+SK_DEFINE_INST_COUNT(GrResource)
 
 GrResource::GrResource(GrGpu* gpu) {
     fGpu        = gpu;

src/gpu/GrTexture.cpp

diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 4f4c5f5..67ce629 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -14,6 +14,8 @@
 #include "GrRenderTarget.h"
 #include "GrResourceCache.h"
 
+SK_DEFINE_INST_COUNT(GrTexture)
+
 bool GrTexture::readPixels(int left, int top, int width, int height,
                            GrPixelConfig config, void* buffer,
                            size_t rowBytes) {