Added Inst counting to SkFlattenable-derived classes

http://codereview.appspot.com/6355043/



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

10 files changed, 22 insertions, 0 deletions

diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index b96b77ea23..74e1db1f4c 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -11,6 +11,8 @@
 #include "SkShader.h"
 #include "SkUnPreMultiply.h"
 
+SK_DEFINE_INST_COUNT(SkColorFilter)
+
 bool SkColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) {
     return false;
 }
diff --git a/src/core/SkColorTable.cpp b/src/core/SkColorTable.cpp
index 3797fbd376..3711de5836 100644
--- a/src/core/SkColorTable.cpp
+++ b/src/core/SkColorTable.cpp
@@ -11,6 +11,8 @@
 #include "SkStream.h"
 #include "SkTemplates.h"
 
+SK_DEFINE_INST_COUNT(SkColorTable)
+
 SkColorTable::SkColorTable(int count)
     : f16BitCache(NULL), fFlags(0)
 {
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index 75e38ce734..96e14a1130 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -14,6 +14,8 @@
 #include "SkDraw.h"
 #include "SkRasterClip.h"
 
+SK_DEFINE_INST_COUNT(SkMaskFilter)
+
 bool SkMaskFilter::filterMask(SkMask*, const SkMask&, const SkMatrix&,
                               SkIPoint*) {
     return false;
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 8ed1ce6175..cba7930afe 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -2159,6 +2159,8 @@ bool SkPaint::nothingToDraw() const {
 
 //////////// Move these to their own file soon.
 
+SK_DEFINE_INST_COUNT(SkImageFilter)
+
 bool SkImageFilter::filterImage(Proxy* proxy, const SkBitmap& src,
                                 const SkMatrix& ctm,
                                 SkBitmap* result, SkIPoint* loc) {
@@ -2205,6 +2207,8 @@ bool SkImageFilter::asADilate(SkISize* radius) const {
 
 //////
 
+SK_DEFINE_INST_COUNT(SkDrawLooper)
+
 bool SkDrawLooper::canComputeFastBounds(const SkPaint& paint) {
     SkCanvas canvas;
 
diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp
index 6b95d9b480..8708e7e8f9 100644
--- a/src/core/SkPathEffect.cpp
+++ b/src/core/SkPathEffect.cpp
@@ -110,6 +110,8 @@ bool SkStrokeRec::applyToPath(SkPath* dst, const SkPath& src) const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SK_DEFINE_INST_COUNT(SkPathEffect)
+
 void SkPathEffect::computeFastBounds(SkRect* dst, const SkRect& src) {
     *dst = src;
 }
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index 1317829320..96c991c0a7 100644
--- a/src/core/SkPixelRef.cpp
+++ b/src/core/SkPixelRef.cpp
@@ -9,6 +9,8 @@
 #include "SkFlattenable.h"
 #include "SkThread.h"
 
+SK_DEFINE_INST_COUNT(SkPixelRef)
+
 // must be a power-of-2. undef to just use 1 mutex
 #define PIXELREF_MUTEX_RING_COUNT       32
 
diff --git a/src/core/SkRasterizer.cpp b/src/core/SkRasterizer.cpp
index 0a0a959452..e5625bff0a 100644
--- a/src/core/SkRasterizer.cpp
+++ b/src/core/SkRasterizer.cpp
@@ -12,6 +12,8 @@
 #include "SkMaskFilter.h"
 #include "SkPath.h"
 
+SK_DEFINE_INST_COUNT(SkRasterizer)
+
 bool SkRasterizer::rasterize(const SkPath& fillPath, const SkMatrix& matrix,
                              const SkIRect* clipBounds, SkMaskFilter* filter,
                              SkMask* mask, SkMask::CreateMode mode) {
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 695361268a..cd40b7f2c8 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -12,6 +12,8 @@
 #include "SkPaint.h"
 #include "SkMallocPixelRef.h"
 
+SK_DEFINE_INST_COUNT(SkShader)
+
 SkShader::SkShader() : fLocalMatrix(NULL) {
     SkDEBUGCODE(fInSession = false;)
 }
diff --git a/src/core/SkShape.cpp b/src/core/SkShape.cpp
index c386af8990..146e74c73b 100644
--- a/src/core/SkShape.cpp
+++ b/src/core/SkShape.cpp
@@ -9,6 +9,8 @@
 #include "SkShape.h"
 #include "SkMatrix.h"
 
+SK_DEFINE_INST_COUNT(SkShape)
+
 #if 0
 static int gShapeCounter;
 static void inc_shape(const SkShape* s) {
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index bb9dc79326..03f996a7eb 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -10,6 +10,8 @@
 #include "SkXfermode.h"
 #include "SkColorPriv.h"
 
+SK_DEFINE_INST_COUNT(SkXfermode)
+
 #define SkAlphaMulAlpha(a, b)   SkMulDiv255Round(a, b)
 
 #if 0