diff options
101 files changed, 58 insertions, 293 deletions
diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index d8e63d530a..8eed0cd9ed 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -71,9 +71,6 @@ private: typedef GrResource INHERITED; }; -SK_DEFINE_INST_COUNT(StencilResource) -SK_DEFINE_INST_COUNT(TextureResource) - static void get_stencil(int i, int* w, int* h, int* s) { *w = i % 1024; *h = i * 2 % 1024; diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp index 5147c99e01..b7a111bcb0 100644 --- a/bench/RefCntBench.cpp +++ b/bench/RefCntBench.cpp @@ -50,8 +50,6 @@ private: typedef SkRefCnt INHERITED; }; -SK_DEFINE_INST_COUNT(PlacedRefCnt) - class RefCntBench_Heap : public SkBenchmark { public: virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { diff --git a/bench/SkBenchmark.cpp b/bench/SkBenchmark.cpp index 39119b98e9..d995415632 100644 --- a/bench/SkBenchmark.cpp +++ b/bench/SkBenchmark.cpp @@ -10,8 +10,6 @@ const char* SkTriState::Name[] = { "default", "true", "false" }; -SK_DEFINE_INST_COUNT(SkBenchmark) - template BenchRegistry* BenchRegistry::gHead; SkString SkBenchmark::gResourcePath; diff --git a/gm/gm_expectations.cpp b/gm/gm_expectations.cpp index 8f04c28e5c..c7bab92044 100644 --- a/gm/gm_expectations.cpp +++ b/gm/gm_expectations.cpp @@ -27,8 +27,6 @@ const static char kJsonKey_Hashtype_Bitmap_64bitMD5[] = "bitmap-64bitMD5"; namespace skiagm { - SK_DEFINE_INST_COUNT(ExpectationsSource) - void gm_fprintf(FILE *stream, const char format[], ...) { va_list args; va_start(args, format); diff --git a/gyp/core.gypi b/gyp/core.gypi index 9edb2ce616..b3f76ea4f4 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -14,7 +14,6 @@ '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', '<(skia_src_path)/core/SkAlphaRuns.cpp', '<(skia_src_path)/core/SkAntiRun.h', - '<(skia_src_path)/core/SkBBoxHierarchy.cpp', '<(skia_src_path)/core/SkBBoxHierarchy.h', '<(skia_src_path)/core/SkBBoxRecord.cpp', '<(skia_src_path)/core/SkBBoxRecord.h', @@ -149,7 +148,6 @@ '<(skia_src_path)/core/SkRasterClip.cpp', '<(skia_src_path)/core/SkRasterizer.cpp', '<(skia_src_path)/core/SkRect.cpp', - '<(skia_src_path)/core/SkRefCnt.cpp', '<(skia_src_path)/core/SkRefDict.cpp', '<(skia_src_path)/core/SkRegion.cpp', '<(skia_src_path)/core/SkRegionPriv.h', diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi index 07cc1dd6dd..3eb60d25c5 100644 --- a/gyp/gpu.gypi +++ b/gyp/gpu.gypi @@ -70,7 +70,6 @@ '<(skia_src_path)/gpu/GrDrawTarget.h', '<(skia_src_path)/gpu/GrDrawTargetCaps.h', '<(skia_src_path)/gpu/GrEffect.cpp', - '<(skia_src_path)/gpu/GrGeometryBuffer.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.h', '<(skia_src_path)/gpu/GrClipMaskCache.h', '<(skia_src_path)/gpu/GrClipMaskCache.cpp', diff --git a/include/core/SkInstCnt.h b/include/core/SkInstCnt.h index cab8ebb916..e38c42d917 100644 --- a/include/core/SkInstCnt.h +++ b/include/core/SkInstCnt.h @@ -14,7 +14,6 @@ * instance counting machinery. A class is added to the system by adding: * SK_DECLARE_INST_COUNT at the top of its declaration for derived classes * SK_DECLARE_INST_COUNT_ROOT at the top of its declaration for a root class - * SK_DEFINE_INST_COUNT at the top of its .cpp file (for both kinds). * At the end of an application a call to all the "root" objects' * CheckInstanceCount methods should be made */ @@ -29,47 +28,49 @@ extern bool gPrintInstCount; // The non-root classes just register themselves with their parent #define SK_DECLARE_INST_COUNT(className) \ SK_DECLARE_INST_COUNT_INTERNAL(className, \ - INHERITED::AddInstChild(CheckInstanceCount);,\ - /**/) - -#define SK_DECLARE_INST_COUNT_TEMPLATE(className) \ - SK_DECLARE_INST_COUNT_INTERNAL(className, \ - INHERITED::AddInstChild(CheckInstanceCount);, \ - typename) + INHERITED::AddInstChild(CheckInstanceCount);) // The root classes registers a function to print out the memory stats when // the app ends #define SK_DECLARE_INST_COUNT_ROOT(className) \ - SK_DECLARE_INST_COUNT_INTERNAL(className, atexit(exitPrint);, /**/) + SK_DECLARE_INST_COUNT_INTERNAL(className, atexit(exitPrint);) -#define SK_DECLARE_INST_COUNT_INTERNAL(className, initStep, templateType) \ +#define SK_DECLARE_INST_COUNT_INTERNAL(className, initStep) \ class SkInstanceCountHelper { \ public: \ typedef int (*PFCheckInstCnt)(int level, bool cleanUp); \ SkInstanceCountHelper() { \ + static bool gInited; \ if (!gInited) { \ initStep \ - gChildren = new SkTArray<PFCheckInstCnt>; \ + GetChildren() = new SkTArray<PFCheckInstCnt>; \ gInited = true; \ } \ - sk_atomic_inc(&gInstanceCount); \ + sk_atomic_inc(GetInstanceCountPtr()); \ } \ \ SkInstanceCountHelper(const SkInstanceCountHelper&) { \ - sk_atomic_inc(&gInstanceCount); \ + sk_atomic_inc(GetInstanceCountPtr()); \ } \ \ ~SkInstanceCountHelper() { \ - sk_atomic_dec(&gInstanceCount); \ + sk_atomic_dec(GetInstanceCountPtr()); \ + } \ + \ + static int32_t* GetInstanceCountPtr() { \ + static int32_t gInstanceCount; \ + return &gInstanceCount; \ + } \ + \ + static SkTArray<PFCheckInstCnt>*& GetChildren() { \ + static SkTArray<PFCheckInstCnt>* gChildren; \ + return gChildren; \ } \ \ - static int32_t gInstanceCount; \ - static bool gInited; \ - static SkTArray<PFCheckInstCnt>* gChildren; \ } fInstanceCountHelper; \ \ static int32_t GetInstanceCount() { \ - return SkInstanceCountHelper::gInstanceCount; \ + return *SkInstanceCountHelper::GetInstanceCountPtr(); \ } \ \ static void exitPrint() { \ @@ -77,57 +78,50 @@ extern bool gPrintInstCount; } \ \ static int CheckInstanceCount(int level = 0, bool cleanUp = false) { \ - if (gPrintInstCount && 0 != SkInstanceCountHelper::gInstanceCount) {\ + if (gPrintInstCount && 0 != GetInstanceCount()) { \ SkDebugf("%*c Leaked %s: %d\n", \ 4*level, ' ', #className, \ - SkInstanceCountHelper::gInstanceCount); \ + GetInstanceCount()); \ } \ - if (NULL == SkInstanceCountHelper::gChildren) { \ - return SkInstanceCountHelper::gInstanceCount; \ + if (NULL == SkInstanceCountHelper::GetChildren()) { \ + return GetInstanceCount(); \ } \ - int childCount = SkInstanceCountHelper::gChildren->count(); \ - int count = SkInstanceCountHelper::gInstanceCount; \ + SkTArray<int (*)(int, bool)>* children = \ + SkInstanceCountHelper::GetChildren(); \ + int childCount = children->count(); \ + int count = GetInstanceCount(); \ for (int i = 0; i < childCount; ++i) { \ - count -= (*(*SkInstanceCountHelper::gChildren)[i])(level+1, cleanUp); \ + count -= (*(*children)[i])(level+1, cleanUp); \ } \ SkASSERT(count >= 0); \ if (gPrintInstCount && childCount > 0 && count > 0) { \ SkDebugf("%*c Leaked ???: %d\n", 4*(level + 1), ' ', count); \ } \ if (cleanUp) { \ - delete SkInstanceCountHelper::gChildren; \ - SkInstanceCountHelper::gChildren = NULL; \ + delete children; \ + SkInstanceCountHelper::GetChildren() = NULL; \ } \ - return SkInstanceCountHelper::gInstanceCount; \ + return GetInstanceCount(); \ } \ \ - static void AddInstChild(templateType SkInstanceCountHelper::PFCheckInstCnt \ - childCheckInstCnt) { \ + static void AddInstChild(int (*childCheckInstCnt)(int, bool)) { \ if (CheckInstanceCount != childCheckInstCnt && \ - NULL != SkInstanceCountHelper::gChildren) { \ - SkInstanceCountHelper::gChildren->push_back(childCheckInstCnt); \ + NULL != SkInstanceCountHelper::GetChildren()) { \ + SkInstanceCountHelper::GetChildren()->push_back(childCheckInstCnt); \ } \ } -#define SK_DEFINE_INST_COUNT(className) \ - int32_t className::SkInstanceCountHelper::gInstanceCount = 0; \ - bool className::SkInstanceCountHelper::gInited = false; \ - SkTArray<className::SkInstanceCountHelper::PFCheckInstCnt>* \ - className::SkInstanceCountHelper::gChildren = NULL; - -#define SK_DEFINE_INST_COUNT_TEMPLATE(templateInfo, className) \ - templateInfo int32_t className::SkInstanceCountHelper::gInstanceCount = 0;\ - templateInfo bool className::SkInstanceCountHelper::gInited = false; \ - templateInfo \ - SkTArray<typename className::SkInstanceCountHelper::PFCheckInstCnt>*\ - className::SkInstanceCountHelper::gChildren = NULL; - #else -#define SK_DECLARE_INST_COUNT(className) -#define SK_DECLARE_INST_COUNT_TEMPLATE(className) -#define SK_DECLARE_INST_COUNT_ROOT(className) +// Typically SK_ENABLE_INST_COUNT=0. Make sure the class declares public typedef INHERITED by +// causing a compile-time error if the typedef is missing. This way SK_ENABLE_INST_COUNT=1 stays +// compiling. +#define SK_DECLARE_INST_COUNT(className) static void AddInstChild() { INHERITED::AddInstChild(); } +#define SK_DECLARE_INST_COUNT_ROOT(className) static void AddInstChild() { } +#endif + +// Following are deprecated. They are defined only for backwards API compatibility. +#define SK_DECLARE_INST_COUNT_TEMPLATE(className) SK_DECLARE_INST_COUNT(className) #define SK_DEFINE_INST_COUNT(className) #define SK_DEFINE_INST_COUNT_TEMPLATE(templateInfo, className) -#endif #endif // SkInstCnt_DEFINED diff --git a/include/lazy/SkLruImageCache.h b/include/lazy/SkLruImageCache.h index 5170a05a54..85095618b7 100644 --- a/include/lazy/SkLruImageCache.h +++ b/include/lazy/SkLruImageCache.h @@ -86,6 +86,7 @@ private: * Remove a set of CachedPixels. Mutex must be locked before calling. */ void removePixels(CachedPixels*); + typedef SkImageCache INHERITED; }; #endif // SkLruImageCache_DEFINED diff --git a/include/lazy/SkPurgeableImageCache.h b/include/lazy/SkPurgeableImageCache.h index 24525b0e50..a6889dfc03 100644 --- a/include/lazy/SkPurgeableImageCache.h +++ b/include/lazy/SkPurgeableImageCache.h @@ -43,5 +43,6 @@ private: int findRec(ID) const; #endif void removeRec(ID); + typedef SkImageCache INHERITED; }; #endif // SkPurgeableImageCache_DEFINED diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index 661c3beff2..8c12a5628a 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -106,6 +106,7 @@ public: SkTArray<FontIdentity>*) { return false; } + typedef SkRefCnt INHERITED; }; #endif diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 7162b7b2ad..99d72f37b9 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -42,8 +42,6 @@ class GrContext; #include "OverView.h" #include "TransitionView.h" -SK_DEFINE_INST_COUNT(SampleWindow::DeviceManager) - extern SampleView* CreateSamplePictFileView(const char filename[]); class PictFileFactory : public SkViewFactory { diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index c7ed34df19..ce64a42d0a 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -10,8 +10,6 @@ #include "SkAdvancedTypefaceMetrics.h" #include "SkTypes.h" -SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics) - #if defined(SK_BUILD_FOR_WIN) #include <dwrite.h> #endif diff --git a/src/core/SkBBoxHierarchy.cpp b/src/core/SkBBoxHierarchy.cpp deleted file mode 100644 index 5232fb7c18..0000000000 --- a/src/core/SkBBoxHierarchy.cpp +++ /dev/null @@ -1,11 +0,0 @@ - -/* - * Copyright 2012 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkBBoxHierarchy.h" - -SK_DEFINE_INST_COUNT(SkBBoxHierarchy) diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index ad840c4390..d2a308b03a 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -24,8 +24,6 @@ #include "SkPackBits.h" #include <new> -SK_DEFINE_INST_COUNT(SkBitmap::Allocator) - static bool isPos32Bits(const Sk64& value) { return !value.isNeg() && value.is32(); } diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index 2d7e41337d..1668618cf7 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -11,8 +11,6 @@ #include "SkRasterClip.h" #include "SkShader.h" -SK_DEFINE_INST_COUNT(SkBitmapDevice) - #define CHECK_FOR_ANNOTATION(paint) \ do { if (paint.getAnnotation()) { return; } } while (0) diff --git a/src/core/SkBitmapHeap.cpp b/src/core/SkBitmapHeap.cpp index a17113842f..1f2f3dcf36 100644 --- a/src/core/SkBitmapHeap.cpp +++ b/src/core/SkBitmapHeap.cpp @@ -12,9 +12,6 @@ #include "SkFlattenableBuffers.h" #include "SkTSearch.h" -SK_DEFINE_INST_COUNT(SkBitmapHeapReader) -SK_DEFINE_INST_COUNT(SkBitmapHeap::ExternalStorage) - SkBitmapHeapEntry::SkBitmapHeapEntry() : fSlot(-1) , fRefCount(0) diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 4eaea11b87..47d3cca81e 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -30,10 +30,6 @@ #include "GrRenderTarget.h" #endif -SK_DEFINE_INST_COUNT(SkBounder) -SK_DEFINE_INST_COUNT(SkCanvas) -SK_DEFINE_INST_COUNT(SkDrawFilter) - // experimental for faster tiled drawing... //#define SK_ENABLE_CLIP_QUICKREJECT diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index abf191e16f..ef0bda74ee 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -12,8 +12,6 @@ #include "SkUnPreMultiply.h" #include "SkString.h" -SK_DEFINE_INST_COUNT(SkColorFilter) - bool SkColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) const { return false; } diff --git a/src/core/SkColorTable.cpp b/src/core/SkColorTable.cpp index 38a46c51a4..c719defe86 100644 --- a/src/core/SkColorTable.cpp +++ b/src/core/SkColorTable.cpp @@ -12,8 +12,6 @@ #include "SkStream.h" #include "SkTemplates.h" -SK_DEFINE_INST_COUNT(SkColorTable) - // As copy constructor is hidden in the class hierarchy, we need to call // default constructor explicitly to suppress a compiler warning. SkColorTable::SkColorTable(const SkColorTable& src) : INHERITED() { diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp index 56c1256d75..fd963a9ff5 100644 --- a/src/core/SkData.cpp +++ b/src/core/SkData.cpp @@ -10,8 +10,6 @@ #include "SkOSFile.h" #include "SkOnce.h" -SK_DEFINE_INST_COUNT(SkData) - SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) { fPtr = ptr; fSize = size; diff --git a/src/core/SkDataTable.cpp b/src/core/SkDataTable.cpp index 917445c98f..e2644a05c9 100644 --- a/src/core/SkDataTable.cpp +++ b/src/core/SkDataTable.cpp @@ -8,8 +8,6 @@ #include "SkData.h" #include "SkDataTable.h" -SK_DEFINE_INST_COUNT(SkDataTable) - static void malloc_freeproc(void* context) { sk_free(context); } diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index c0d4ad3694..0c9e9d66b6 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -9,8 +9,6 @@ #include "SkDevice.h" #include "SkMetaData.h" -SK_DEFINE_INST_COUNT(SkBaseDevice) - #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) const SkCanvas::Config8888 SkBaseDevice::kPMColorAlias = SkCanvas::kBGRA_Premul_Config8888; #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) diff --git a/src/core/SkDeviceProfile.cpp b/src/core/SkDeviceProfile.cpp index a15069a17e..8d60151f6f 100644 --- a/src/core/SkDeviceProfile.cpp +++ b/src/core/SkDeviceProfile.cpp @@ -9,8 +9,6 @@ #include "SkDeviceProfile.h" #include "SkThread.h" -SK_DEFINE_INST_COUNT(SkDeviceProfile) - #define DEFAULT_GAMMAEXP 2.2f #define DEFAULT_CONTRASTSCALE 0.5f #define DEFAULT_LCDCONFIG SkDeviceProfile::kNone_LCDConfig diff --git a/src/core/SkDrawLooper.cpp b/src/core/SkDrawLooper.cpp index 0277986a8b..bac2d969c0 100644 --- a/src/core/SkDrawLooper.cpp +++ b/src/core/SkDrawLooper.cpp @@ -11,8 +11,6 @@ #include "SkPaint.h" #include "SkRect.h" -SK_DEFINE_INST_COUNT(SkDrawLooper) - bool SkDrawLooper::canComputeFastBounds(const SkPaint& paint) { SkCanvas canvas; diff --git a/src/core/SkFlattenable.cpp b/src/core/SkFlattenable.cpp index 6cebb225d3..877fa0a85f 100644 --- a/src/core/SkFlattenable.cpp +++ b/src/core/SkFlattenable.cpp @@ -8,8 +8,6 @@ #include "SkFlattenable.h" #include "SkPtrRecorder.h" -SK_DEFINE_INST_COUNT(SkFlattenable) - /////////////////////////////////////////////////////////////////////////////// void SkFlattenable::flatten(SkFlattenableWriteBuffer&) const diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp index f3d30e8591..a209b97027 100644 --- a/src/core/SkFontHost.cpp +++ b/src/core/SkFontHost.cpp @@ -69,8 +69,6 @@ SkFontStyle::SkFontStyle(int weight, int width, Slant slant) { #include "SkFontMgr.h" -SK_DEFINE_INST_COUNT(SkFontStyleSet) - class SkEmptyFontStyleSet : public SkFontStyleSet { public: virtual int count() SK_OVERRIDE { return 0; } @@ -92,8 +90,6 @@ SkFontStyleSet* SkFontStyleSet::CreateEmpty() { /////////////////////////////////////////////////////////////////////////////// -SK_DEFINE_INST_COUNT(SkFontMgr) - class SkEmptyFontMgr : public SkFontMgr { protected: virtual int onCountFamilies() SK_OVERRIDE { diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index aadf9040b0..2a221fb869 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -17,8 +17,6 @@ #include "SkImageFilterUtils.h" #endif -SK_DEFINE_INST_COUNT(SkImageFilter) - SkImageFilter::SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect) : fInputCount(inputCount), fInputs(new SkImageFilter*[inputCount]), diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index cd25716377..f062f135fd 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -21,8 +21,6 @@ #include "SkGrPixelRef.h" #endif -SK_DEFINE_INST_COUNT(SkMaskFilter) - bool SkMaskFilter::filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const { return false; diff --git a/src/core/SkMaskGamma.h b/src/core/SkMaskGamma.h index 9d3fd9a344..1f2b73caac 100644 --- a/src/core/SkMaskGamma.h +++ b/src/core/SkMaskGamma.h @@ -92,8 +92,8 @@ void SkTMaskGamma_build_correcting_lut(uint8_t table[256], U8CPU srcI, SkScalar * @param B The number of luminance bits to use [1, 8] from the blue channel. */ template <int R_LUM_BITS, int G_LUM_BITS, int B_LUM_BITS> class SkTMaskGamma : public SkRefCnt { + SK_DECLARE_INST_COUNT(SkTMaskGamma) public: - SK_DECLARE_INST_COUNT_TEMPLATE(SkTMaskGamma) /** Creates a linear SkTMaskGamma. */ SkTMaskGamma() : fIsLinear(true) { } @@ -147,11 +147,6 @@ private: }; -#define MacroComma , -SK_DEFINE_INST_COUNT_TEMPLATE( - template <int R_LUM_BITS MacroComma int G_LUM_BITS MacroComma int B_LUM_BITS>, - SkTMaskGamma<R_LUM_BITS MacroComma G_LUM_BITS MacroComma B_LUM_BITS>); - /** * SkTMaskPreBlend is a tear-off of SkTMaskGamma. It provides the tables to * convert a linear alpha value for a given channel to a gamma correcting alpha diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 6c48e56b5f..eaa6c93dec 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -15,8 +15,6 @@ #include "SkRRect.h" #include "SkThread.h" -SK_DEFINE_INST_COUNT(SkPath); - // This value is just made-up for now. When count is 4, calling memset was much // slower than just writing the loop. This seems odd, and hopefully in the // future this we appear to have been a fluke... diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp index e7f68225c3..59ba3ec31f 100644 --- a/src/core/SkPathEffect.cpp +++ b/src/core/SkPathEffect.cpp @@ -12,8 +12,6 @@ /////////////////////////////////////////////////////////////////////////////// -SK_DEFINE_INST_COUNT(SkPathEffect) - void SkPathEffect::computeFastBounds(SkRect* dst, const SkRect& src) const { *dst = src; } diff --git a/src/core/SkPathHeap.cpp b/src/core/SkPathHeap.cpp index 12db3c482f..c6e2129e9e 100644 --- a/src/core/SkPathHeap.cpp +++ b/src/core/SkPathHeap.cpp @@ -11,8 +11,6 @@ #include "SkFlattenableBuffers.h" #include <new> -SK_DEFINE_INST_COUNT(SkPathHeap) - #define kPathCount 64 SkPathHeap::SkPathHeap() : fHeap(kPathCount * sizeof(SkPath)) { diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp index 1678fdc235..a02df3024e 100644 --- a/src/core/SkPathRef.cpp +++ b/src/core/SkPathRef.cpp @@ -10,8 +10,6 @@ #include "SkPath.h" #include "SkPathRef.h" -SK_DEFINE_INST_COUNT(SkPathRef); - ////////////////////////////////////////////////////////////////////////////// SkPathRef::Editor::Editor(SkAutoTUnref<SkPathRef>* pathRef, int incReserveVerbs, diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 9531d189ef..2b9b9e934c 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -26,8 +26,6 @@ #include "SkRTree.h" #include "SkBBoxHierarchyRecord.h" -SK_DEFINE_INST_COUNT(SkPicture) - #define DUMP_BUFFER_SIZE 65536 //#define ENABLE_TIME_DRAW // dumps milliseconds for each draw diff --git a/src/core/SkPictureFlat.cpp b/src/core/SkPictureFlat.cpp index 2a7d15a7b4..149cf7cc02 100644 --- a/src/core/SkPictureFlat.cpp +++ b/src/core/SkPictureFlat.cpp @@ -16,8 +16,6 @@ #include "SkTypeface.h" #include "SkXfermode.h" -SK_DEFINE_INST_COUNT(SkFlatController) - /////////////////////////////////////////////////////////////////////////////// SkTypefacePlayback::SkTypefacePlayback() : fCount(0), fArray(NULL) {} diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp index 9f2db25848..5f4ed93423 100644 --- a/src/core/SkPictureStateTree.cpp +++ b/src/core/SkPictureStateTree.cpp @@ -9,8 +9,6 @@ #include "SkPictureStateTree.h" #include "SkCanvas.h" -SK_DEFINE_INST_COUNT(SkPictureStateTree) - SkPictureStateTree::SkPictureStateTree() : fAlloc(2048) , fRoot(NULL) diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index 068513bb1c..1afc3360a2 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -9,9 +9,6 @@ #include "SkFlattenableBuffers.h" #include "SkThread.h" -SK_DEFINE_INST_COUNT(SkPixelRef) - - #ifdef SK_USE_POSIX_THREADS static SkBaseMutex gPixelRefMutexRing[] = { diff --git a/src/core/SkPtrRecorder.cpp b/src/core/SkPtrRecorder.cpp index 2acb5af939..aae28d0e3f 100644 --- a/src/core/SkPtrRecorder.cpp +++ b/src/core/SkPtrRecorder.cpp @@ -8,9 +8,6 @@ #include "SkPtrRecorder.h" #include "SkTSearch.h" -SK_DEFINE_INST_COUNT(SkPtrSet) -SK_DEFINE_INST_COUNT(SkNamedFactorySet) - void SkPtrSet::reset() { Pair* p = fList.begin(); Pair* stop = fList.end(); diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp index e3d2eb696d..253a7ee1d4 100644 --- a/src/core/SkRTree.cpp +++ b/src/core/SkRTree.cpp @@ -16,8 +16,6 @@ static inline void join_no_empty_check(const SkIRect& joinWith, SkIRect* out); /////////////////////////////////////////////////////////////////////////////////////////////////// -SK_DEFINE_INST_COUNT(SkRTree) - SkRTree* SkRTree::Create(int minChildren, int maxChildren, SkScalar aspectRatio, bool sortWhenBulkLoading) { if (minChildren < maxChildren && (maxChildren + 1) / 2 >= minChildren && diff --git a/src/core/SkRasterizer.cpp b/src/core/SkRasterizer.cpp index a65d541ac5..3a7af95555 100644 --- a/src/core/SkRasterizer.cpp +++ b/src/core/SkRasterizer.cpp @@ -12,8 +12,6 @@ #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) const { diff --git a/src/core/SkRefCnt.cpp b/src/core/SkRefCnt.cpp deleted file mode 100644 index b922e03e35..0000000000 --- a/src/core/SkRefCnt.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - - -#include "SkRefCnt.h" -#include "SkWeakRefCnt.h" - -SK_DEFINE_INST_COUNT(SkRefCntBase) -SK_DEFINE_INST_COUNT(SkWeakRefCnt) diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 8f6bfb5d80..33fddb1183 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -12,8 +12,6 @@ #include "SkPaint.h" #include "SkMallocPixelRef.h" -SK_DEFINE_INST_COUNT(SkShader) - SkShader::SkShader() { fLocalMatrix.reset(); SkDEBUGCODE(fInSetContext = false;) diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp index a7e92cf601..3350f82fc1 100644 --- a/src/core/SkStream.cpp +++ b/src/core/SkStream.cpp @@ -13,15 +13,6 @@ #include "SkString.h" #include "SkOSFile.h" -SK_DEFINE_INST_COUNT(SkStream) -SK_DEFINE_INST_COUNT(SkWStream) -SK_DEFINE_INST_COUNT(SkFILEStream) -SK_DEFINE_INST_COUNT(SkMemoryStream) -SK_DEFINE_INST_COUNT(SkFILEWStream) -SK_DEFINE_INST_COUNT(SkMemoryWStream) -SK_DEFINE_INST_COUNT(SkDynamicMemoryWStream) -SK_DEFINE_INST_COUNT(SkDebugWStream) - /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 2362761695..09a64324af 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -11,8 +11,6 @@ #include "SkStream.h" #include "SkTypeface.h" -SK_DEFINE_INST_COUNT(SkTypeface) - //#define TRACE_LIFECYCLE #ifdef TRACE_LIFECYCLE diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 20d88162a4..313e2aef8c 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -19,8 +19,6 @@ #include "SkXfermode_opts_arm_neon.h" #endif -SK_DEFINE_INST_COUNT(SkXfermode) - #define SkAlphaMulAlpha(a, b) SkMulDiv255Round(a, b) #if 0 diff --git a/src/doc/SkDocument.cpp b/src/doc/SkDocument.cpp index 85a2bad5e8..5b2237d18a 100644 --- a/src/doc/SkDocument.cpp +++ b/src/doc/SkDocument.cpp @@ -8,8 +8,6 @@ #include "SkDocument.h" #include "SkStream.h" -SK_DEFINE_INST_COUNT(SkDocument) - SkDocument::SkDocument(SkWStream* stream, void (*doneProc)(SkWStream*, bool)) { fStream = stream; // we do not own this object. fDoneProc = doneProc; diff --git a/src/effects/SkBitmapAlphaThresholdShader.cpp b/src/effects/SkBitmapAlphaThresholdShader.cpp index 05d7ba30d3..44db167d4e 100644 --- a/src/effects/SkBitmapAlphaThresholdShader.cpp +++ b/src/effects/SkBitmapAlphaThresholdShader.cpp @@ -34,8 +34,6 @@ private: typedef SkShader INHERITED; }; -SK_DEFINE_INST_COUNT(BATShader) - SkShader* SkBitmapAlphaThresholdShader::Create(const SkBitmap& bitmap, const SkRegion& region, U8CPU threshold) { diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp index 998c4bcd0a..65f058b9d4 100644 --- a/src/effects/SkLayerDrawLooper.cpp +++ b/src/effects/SkLayerDrawLooper.cpp @@ -13,8 +13,6 @@ #include "SkStringUtils.h" #include "SkUnPreMultiply.h" -SK_DEFINE_INST_COUNT(SkLayerDrawLooper) - SkLayerDrawLooper::LayerInfo::LayerInfo() { fFlagsMask = 0; // ignore our paint flags fPaintBits = 0; // ignore our paint fields diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 4e3cee0bbd..50cca07dfd 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -549,8 +549,6 @@ private: SkPoint3 fColor; }; -SK_DEFINE_INST_COUNT(SkLight) - /////////////////////////////////////////////////////////////////////////////// class SkDistantLight : public SkLight { diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp index aa599ca832..2c21f09f00 100644 --- a/src/gpu/GrAARectRenderer.cpp +++ b/src/gpu/GrAARectRenderer.cpp @@ -13,8 +13,6 @@ #include "SkColorPriv.h" #include "effects/GrVertexEffect.h" -SK_DEFINE_INST_COUNT(GrAARectRenderer) - /////////////////////////////////////////////////////////////////////////////// class GrGLAlignedRectEffect; diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 433b0bb06b..0eb8c5b758 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -32,9 +32,6 @@ #include "SkTLS.h" #include "SkTrace.h" -SK_DEFINE_INST_COUNT(GrContext) -SK_DEFINE_INST_COUNT(GrDrawState) - // It can be useful to set this to false to test whether a bug is caused by using the // InOrderDrawBuffer, to compare performance of using/not using InOrderDrawBuffer, or to make // debugging simpler. diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp index 6a1c4544b9..0b4d96af84 100644 --- a/src/gpu/GrDrawTarget.cpp +++ b/src/gpu/GrDrawTarget.cpp @@ -18,8 +18,6 @@ #include "SkStrokeRec.h" -SK_DEFINE_INST_COUNT(GrDrawTarget) - //////////////////////////////////////////////////////////////////////////////// GrDrawTarget::DrawInfo& GrDrawTarget::DrawInfo::operator =(const DrawInfo& di) { @@ -962,8 +960,6 @@ void GrDrawTarget::initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* d /////////////////////////////////////////////////////////////////////////////// -SK_DEFINE_INST_COUNT(GrDrawTargetCaps) - void GrDrawTargetCaps::reset() { f8BitPaletteSupport = false; fNPOTTextureTileSupport = false; diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp index a64fd7c4bb..986e80a57e 100644 --- a/src/gpu/GrEffect.cpp +++ b/src/gpu/GrEffect.cpp @@ -12,8 +12,6 @@ #include "GrMemoryPool.h" #include "SkTLS.h" -SK_DEFINE_INST_COUNT(GrEffect) - #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS SkTArray<GrEffectTestFactory*, true>* GrEffectTestFactory::GetFactories() { static SkTArray<GrEffectTestFactory*, true> gFactories; @@ -61,8 +59,6 @@ int32_t GrBackendEffectFactory::fCurrEffectClassID = GrBackendEffectFactory::kIl /////////////////////////////////////////////////////////////////////////////// -SK_DEFINE_INST_COUNT(GrEffectRef) - GrEffectRef::~GrEffectRef() { SkASSERT(this->unique()); fEffect->EffectRefDestroyed(); diff --git a/src/gpu/GrGeometryBuffer.cpp b/src/gpu/GrGeometryBuffer.cpp deleted file mode 100644 index 202d0c33ee..0000000000 --- a/src/gpu/GrGeometryBuffer.cpp +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "GrGeometryBuffer.h" - -SK_DEFINE_INST_COUNT(GrGeometryBuffer) diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 8f078dbc45..ac33a5cc5d 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -22,8 +22,6 @@ #include "effects/GrVertexEffect.h" -SK_DEFINE_INST_COUNT(GrOvalRenderer) - namespace { struct CircleVertex { diff --git a/src/gpu/GrPath.cpp b/src/gpu/GrPath.cpp index f928dffaa8..adb3fe6333 100644 --- a/src/gpu/GrPath.cpp +++ b/src/gpu/GrPath.cpp @@ -7,8 +7,6 @@ #include "GrPath.h" -SK_DEFINE_INST_COUNT(GrPath) - GrResourceKey GrPath::ComputeKey(const SkPath& path, const SkStrokeRec& stroke) { static const GrResourceKey::ResourceType gPathResourceType = GrResourceKey::GenerateResourceType(); static const GrCacheID::Domain gPathDomain = GrCacheID::GenerateDomain(); diff --git a/src/gpu/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp index e88db22b30..3dcedf9f7c 100644 --- a/src/gpu/GrPathRenderer.cpp +++ b/src/gpu/GrPathRenderer.cpp @@ -8,8 +8,6 @@ #include "GrPathRenderer.h" -SK_DEFINE_INST_COUNT(GrPathRenderer) - GrPathRenderer::GrPathRenderer() { } diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp index d6de12b3f5..cac0475bbf 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -14,8 +14,6 @@ #include "GrDrawTargetCaps.h" #include "GrGpu.h" -SK_DEFINE_INST_COUNT(GrPathRendererChain) - GrPathRendererChain::GrPathRendererChain(GrContext* context) : fInit(false) , fOwner(context) { diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp index 49a76149f0..f18df2cfa6 100644 --- a/src/gpu/GrRenderTarget.cpp +++ b/src/gpu/GrRenderTarget.cpp @@ -13,8 +13,6 @@ #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, diff --git a/src/gpu/GrResource.cpp b/src/gpu/GrResource.cpp index 8b43906164..e20a30ffd3 100644 --- a/src/gpu/GrResource.cpp +++ b/src/gpu/GrResource.cpp @@ -10,8 +10,6 @@ #include "GrResource.h" #include "GrGpu.h" -SK_DEFINE_INST_COUNT(GrResource) - GrResource::GrResource(GrGpu* gpu, bool isWrapped) { fGpu = gpu; fCacheEntry = NULL; diff --git a/src/gpu/GrStencilBuffer.cpp b/src/gpu/GrStencilBuffer.cpp index c12de523b3..ea7b4fa157 100644 --- a/src/gpu/GrStencilBuffer.cpp +++ b/src/gpu/GrStencilBuffer.cpp @@ -12,8 +12,6 @@ #include "GrGpu.h" #include "GrResourceCache.h" -SK_DEFINE_INST_COUNT(GrStencilBuffer) - void GrStencilBuffer::transferToCache() { SkASSERT(NULL == this->getCacheEntry()); diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp index 3ac8bc2280..fed95f232f 100644 --- a/src/gpu/GrSurface.cpp +++ b/src/gpu/GrSurface.cpp @@ -11,8 +11,6 @@ #include "SkImageEncoder.h" #include <stdio.h> -SK_DEFINE_INST_COUNT(GrSurface) - bool GrSurface::savePixels(const char* filename) { SkBitmap bm; bm.setConfig(SkBitmap::kARGB_8888_Config, this->width(), this->height()); diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp index bae5361075..c70e822cd9 100644 --- a/src/gpu/GrTextStrike.cpp +++ b/src/gpu/GrTextStrike.cpp @@ -16,9 +16,6 @@ #include "edtaa3.h" #endif -SK_DEFINE_INST_COUNT(GrFontScaler) -SK_DEFINE_INST_COUNT(GrKey) - /////////////////////////////////////////////////////////////////////////////// #define FONT_CACHE_STATS 0 diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index b5a0195df2..f851515371 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -15,8 +15,6 @@ #include "GrRenderTarget.h" #include "GrResourceCache.h" -SK_DEFINE_INST_COUNT(GrTexture) - GrTexture::~GrTexture() { if (NULL != fRenderTarget.get()) { fRenderTarget.get()->owningTextureDestroyed(); diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 1a39ba597c..8d8c02254a 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -11,8 +11,6 @@ #include "SkTSearch.h" #include "SkTSort.h" -SK_DEFINE_INST_COUNT(GrGLCaps) - GrGLCaps::GrGLCaps() { this->reset(); } diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index 09f6a65e7e..e1c69e18a4 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -12,8 +12,6 @@ #include <stdio.h> -SK_DEFINE_INST_COUNT(GrGLInterface) - #if GR_GL_PER_GL_FUNC_CALLBACK namespace { void GrGLDefaultInterfaceCallback(const GrGLInterface*) {} diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 5b030fa36a..cac38b4bdd 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -17,8 +17,6 @@ #include "GrGLSL.h" #include "SkXfermode.h" -SK_DEFINE_INST_COUNT(GrGLProgram) - #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X) diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index 977212255f..856cfb1277 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -8,8 +8,6 @@ #include "GrGLTexture.h" #include "GrGpuGL.h" -SK_DEFINE_INST_COUNT(GrGLTexID) - #define GPUGL static_cast<GrGpuGL*>(getGpu()) #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index a777e8f3ba..a3beab1a59 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -27,8 +27,6 @@ struct GrGpuGL::ProgramCache::Entry { unsigned int fLRUStamp; }; -SK_DEFINE_INST_COUNT(GrGpuGL::ProgramCache::Entry); - struct GrGpuGL::ProgramCache::ProgDescLess { bool operator() (const GrGLProgramDesc& desc, const Entry* entry) { SkASSERT(NULL != entry->fProgram.get()); diff --git a/src/gpu/gl/SkGLContextHelper.cpp b/src/gpu/gl/SkGLContextHelper.cpp index 6f0372dde4..da446be0b0 100644 --- a/src/gpu/gl/SkGLContextHelper.cpp +++ b/src/gpu/gl/SkGLContextHelper.cpp @@ -8,8 +8,6 @@ #include "gl/SkGLContextHelper.h" #include "GrGLUtil.h" -SK_DEFINE_INST_COUNT(SkGLContextHelper) - SkGLContextHelper::SkGLContextHelper() : fFBO(0) , fColorBufferID(0) diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp index 2ccd158479..1a0e7accf2 100644 --- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp +++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp @@ -786,8 +786,6 @@ private: typedef GrGLInterface INHERITED; }; -SK_DEFINE_INST_COUNT(GrDebugGLInterface) - //////////////////////////////////////////////////////////////////////////////// const GrGLInterface* GrGLCreateDebugInterface() { GrGLInterface* interface = SkNEW(GrDebugGLInterface); diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 39fd93acc6..620922f645 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -10,8 +10,6 @@ #include "SkImagePriv.h" #include "SkImage_Base.h" -SK_DEFINE_INST_COUNT(SkImage) - static SkImage_Base* as_IB(SkImage* image) { return static_cast<SkImage_Base*>(image); } diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 036e45bb65..ab0a5237fd 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -36,8 +36,6 @@ private: typedef SkImage_Base INHERITED; }; -SK_DEFINE_INST_COUNT(SkImage_Gpu) - /////////////////////////////////////////////////////////////////////////////// SkImage_Gpu::SkImage_Gpu(const SkBitmap& bitmap) diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp index 2fd4e1042b..2dde36b96d 100644 --- a/src/image/SkSurface.cpp +++ b/src/image/SkSurface.cpp @@ -9,8 +9,6 @@ #include "SkImagePriv.h" #include "SkCanvas.h" -SK_DEFINE_INST_COUNT(SkSurface) - /////////////////////////////////////////////////////////////////////////////// SkSurface_Base::SkSurface_Base(int width, int height) : INHERITED(width, height) { diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index e9049aef2e..e673cef670 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -31,8 +31,6 @@ private: typedef SkSurface_Base INHERITED; }; -SK_DEFINE_INST_COUNT(SkSurface_Gpu) - /////////////////////////////////////////////////////////////////////////////// SkSurface_Gpu::SkSurface_Gpu(GrContext* ctx, const SkImageInfo& info, diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp index 6bfd4f1a60..5fb3c72b9f 100644 --- a/src/images/SkImageDecoder.cpp +++ b/src/images/SkImageDecoder.cpp @@ -14,10 +14,6 @@ #include "SkTemplates.h" #include "SkCanvas.h" -SK_DEFINE_INST_COUNT(SkImageDecoder::Peeker) -SK_DEFINE_INST_COUNT(SkImageDecoder::Chooser) -SK_DEFINE_INST_COUNT(SkImageDecoderFactory) - static SkBitmap::Config gDeviceConfig = SkBitmap::kNo_Config; SkBitmap::Config SkImageDecoder::GetDeviceConfig() diff --git a/src/images/SkMovie.cpp b/src/images/SkMovie.cpp index d2439eb6e0..9a2a71cd57 100644 --- a/src/images/SkMovie.cpp +++ b/src/images/SkMovie.cpp @@ -9,8 +9,6 @@ #include "SkCanvas.h" #include "SkPaint.h" -SK_DEFINE_INST_COUNT(SkMovie) - // We should never see this in normal operation since our time values are // 0-based. So we use it as a sentinal. #define UNINITIALIZED_MSEC ((SkMSec)-1) diff --git a/src/lazy/SkBitmapFactory.cpp b/src/lazy/SkBitmapFactory.cpp index 1bbb6f0de7..17ecf47c86 100644 --- a/src/lazy/SkBitmapFactory.cpp +++ b/src/lazy/SkBitmapFactory.cpp @@ -13,8 +13,6 @@ #include "SkImagePriv.h" #include "SkLazyPixelRef.h" -SK_DEFINE_INST_COUNT(SkBitmapFactory::CacheSelector) - SkBitmapFactory::SkBitmapFactory(SkBitmapFactory::DecodeProc proc) : fDecodeProc(proc) , fImageCache(NULL) diff --git a/src/lazy/SkLruImageCache.cpp b/src/lazy/SkLruImageCache.cpp index 40cfefa29b..26f7ef5483 100644 --- a/src/lazy/SkLruImageCache.cpp +++ b/src/lazy/SkLruImageCache.cpp @@ -7,9 +7,6 @@ #include "SkLruImageCache.h" -SK_DEFINE_INST_COUNT(SkImageCache) -SK_DEFINE_INST_COUNT(SkLruImageCache) - static intptr_t NextGenerationID() { static intptr_t gNextID; do { diff --git a/src/lazy/SkPurgeableImageCache.cpp b/src/lazy/SkPurgeableImageCache.cpp index 0d36e4a9a9..0f2c5e3c8e 100644 --- a/src/lazy/SkPurgeableImageCache.cpp +++ b/src/lazy/SkPurgeableImageCache.cpp @@ -13,7 +13,6 @@ #include "SkTSearch.h" #endif -SK_DEFINE_INST_COUNT(SkPurgeableImageCache) SK_DECLARE_STATIC_MUTEX(gPurgeableImageMutex); SkImageCache* SkPurgeableImageCache::Create() { diff --git a/src/pdf/SkPDFFont.h b/src/pdf/SkPDFFont.h index f5d358f34a..694c69ac39 100644 --- a/src/pdf/SkPDFFont.h +++ b/src/pdf/SkPDFFont.h @@ -78,6 +78,7 @@ private: reference to each instantiated class. */ class SkPDFFont : public SkPDFDict { + SK_DECLARE_INST_COUNT(SkPDFFont) public: virtual ~SkPDFFont(); @@ -198,6 +199,7 @@ private: // This should be made a hash table if performance is a problem. static SkTDArray<FontRec>& CanonicalFonts(); static SkBaseMutex& CanonicalFontsMutex(); + typedef SkPDFDict INHERITED; }; #endif diff --git a/src/pdf/SkPDFGraphicState.h b/src/pdf/SkPDFGraphicState.h index 84c429105e..9182efeffb 100644 --- a/src/pdf/SkPDFGraphicState.h +++ b/src/pdf/SkPDFGraphicState.h @@ -27,6 +27,7 @@ class SkPDFFormXObject; */ class SkPDFGraphicState : public SkPDFDict { + SK_DECLARE_INST_COUNT(SkPDFGraphicState) public: enum SkPDFSMaskMode { kAlpha_SMaskMode, @@ -104,6 +105,7 @@ private: static SkPDFObject* GetInvertFunction(); static int Find(const SkPaint& paint); + typedef SkPDFDict INHERITED; }; #endif diff --git a/src/pdf/SkPDFPage.h b/src/pdf/SkPDFPage.h index 2ce773c017..47573c7438 100644 --- a/src/pdf/SkPDFPage.h +++ b/src/pdf/SkPDFPage.h @@ -25,6 +25,7 @@ class SkWStream; tree and points to the content of the page. */ class SkPDFPage : public SkPDFDict { + SK_DECLARE_INST_COUNT(SkPDFPage) public: /** Create a PDF page with the passed PDF device. The device need not * have content on it yet. @@ -102,6 +103,7 @@ private: // Once the content is finalized, put it into a stream for output. SkAutoTUnref<SkPDFStream> fContentStream; + typedef SkPDFDict INHERITED; }; #endif diff --git a/src/pdf/SkPDFResourceDict.cpp b/src/pdf/SkPDFResourceDict.cpp index 6f5d1679a3..8a0208d64a 100644 --- a/src/pdf/SkPDFResourceDict.cpp +++ b/src/pdf/SkPDFResourceDict.cpp @@ -8,8 +8,6 @@ #include "SkPDFResourceDict.h" #include "SkPostConfig.h" -SK_DEFINE_INST_COUNT(SkPDFResourceDict) - // Sanity check that the values of enum SkPDFResourceType correspond to the // expected values as defined in the arrays below. // If these are failing, you may need to update the resource_type_prefixes diff --git a/src/pdf/SkPDFResourceDict.h b/src/pdf/SkPDFResourceDict.h index ab25b4a4dc..17ea338f59 100644 --- a/src/pdf/SkPDFResourceDict.h +++ b/src/pdf/SkPDFResourceDict.h @@ -95,6 +95,7 @@ private: SkTSet<SkPDFObject*> fResources; SkTDArray<SkPDFDict*> fTypes; + typedef SkPDFDict INHERITED; }; #endif diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index 60992c3bf6..94bdf2d78d 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -499,6 +499,7 @@ private: }; class SkPDFFunctionShader : public SkPDFDict, public SkPDFShader { + SK_DECLARE_INST_COUNT(SkPDFFunctionShader) public: explicit SkPDFFunctionShader(SkPDFShader::State* state); virtual ~SkPDFFunctionShader() { @@ -524,6 +525,7 @@ private: SkAutoTDelete<const SkPDFShader::State> fState; SkPDFStream* makePSFunction(const SkString& psCode, SkPDFArray* domain); + typedef SkPDFDict INHERITED; }; /** diff --git a/src/pdf/SkPDFStream.h b/src/pdf/SkPDFStream.h index d7ff115ba9..6371bc187d 100644 --- a/src/pdf/SkPDFStream.h +++ b/src/pdf/SkPDFStream.h @@ -25,6 +25,7 @@ class SkPDFCatalog; is feasible. */ class SkPDFStream : public SkPDFDict { + SK_DECLARE_INST_COUNT(SkPDFStream) public: /** Create a PDF stream. A Length entry is automatically added to the * stream dictionary. The stream may be retained (stream->ref() may be diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp index ed02d2bd12..55871c507d 100644 --- a/src/pdf/SkPDFTypes.cpp +++ b/src/pdf/SkPDFTypes.cpp @@ -17,16 +17,6 @@ #define SNPRINTF snprintf #endif -SK_DEFINE_INST_COUNT(SkPDFArray) -SK_DEFINE_INST_COUNT(SkPDFBool) -SK_DEFINE_INST_COUNT(SkPDFDict) -SK_DEFINE_INST_COUNT(SkPDFInt) -SK_DEFINE_INST_COUNT(SkPDFName) -SK_DEFINE_INST_COUNT(SkPDFObject) -SK_DEFINE_INST_COUNT(SkPDFObjRef) -SK_DEFINE_INST_COUNT(SkPDFScalar) -SK_DEFINE_INST_COUNT(SkPDFString) - /////////////////////////////////////////////////////////////////////////////// void SkPDFObject::emit(SkWStream* stream, SkPDFCatalog* catalog, diff --git a/src/text/SkTextLayout.cpp b/src/text/SkTextLayout.cpp index 4e531cf21d..6f8bca562a 100644 --- a/src/text/SkTextLayout.cpp +++ b/src/text/SkTextLayout.cpp @@ -7,8 +7,6 @@ */ #include "SkTextLayout.h" -SK_DEFINE_INST_COUNT(SkTextStyle) - SkTextStyle::SkTextStyle() { fPaint.setAntiAlias(true); } diff --git a/src/utils/SkBoundaryPatch.cpp b/src/utils/SkBoundaryPatch.cpp index fd1545d2a9..e5fcc4051b 100644 --- a/src/utils/SkBoundaryPatch.cpp +++ b/src/utils/SkBoundaryPatch.cpp @@ -7,8 +7,6 @@ */ #include "SkBoundaryPatch.h" -SK_DEFINE_INST_COUNT(SkBoundary) - SkBoundaryPatch::SkBoundaryPatch() : fBoundary(NULL) {} SkBoundaryPatch::~SkBoundaryPatch() { diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index 0e1a2321e1..dabf0d7989 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -24,8 +24,6 @@ #include "SkPathEffect.h" #include "SkMaskFilter.h" -SK_DEFINE_INST_COUNT(SkDumpCanvas::Dumper) - static void toString(const SkRect& r, SkString* str) { str->appendf("[%g,%g %g:%g]", SkScalarToFloat(r.fLeft), SkScalarToFloat(r.fTop), diff --git a/src/utils/SkLayer.cpp b/src/utils/SkLayer.cpp index 126dd92198..525917ff66 100644 --- a/src/utils/SkLayer.cpp +++ b/src/utils/SkLayer.cpp @@ -15,8 +15,6 @@ static int gLayerAllocCount; #endif -SK_DEFINE_INST_COUNT(SkLayer) - /////////////////////////////////////////////////////////////////////////////// SkLayer::SkLayer() { diff --git a/src/utils/SkUnitMappers.cpp b/src/utils/SkUnitMappers.cpp index ceff9ca00c..5976e9de52 100644 --- a/src/utils/SkUnitMappers.cpp +++ b/src/utils/SkUnitMappers.cpp @@ -8,8 +8,6 @@ #include "SkUnitMappers.h" #include "SkFlattenableBuffers.h" -SK_DEFINE_INST_COUNT(SkUnitMapper) - SkDiscreteMapper::SkDiscreteMapper(int segments) { if (segments < 2) { fSegments = 0; diff --git a/src/views/SkEventSink.cpp b/src/views/SkEventSink.cpp index b6a3a6ee82..7763adef54 100644 --- a/src/views/SkEventSink.cpp +++ b/src/views/SkEventSink.cpp @@ -14,8 +14,6 @@ #include "SkThread.h" #include "SkTime.h" -SK_DEFINE_INST_COUNT(SkEventSink) - class SkEventSink_Globals { public: SkEventSink_Globals() { diff --git a/src/views/SkView.cpp b/src/views/SkView.cpp index e3e05f919e..f211ad9693 100644 --- a/src/views/SkView.cpp +++ b/src/views/SkView.cpp @@ -8,9 +8,6 @@ #include "SkView.h" #include "SkCanvas.h" -SK_DEFINE_INST_COUNT(SkView::Artist) -SK_DEFINE_INST_COUNT(SkView::Layout) - //////////////////////////////////////////////////////////////////////// SkView::SkView(uint32_t flags) : fFlags(SkToU8(flags)) diff --git a/src/views/animated/SkWidgetViews.cpp b/src/views/animated/SkWidgetViews.cpp index 45e9868856..8e7f5175c9 100644 --- a/src/views/animated/SkWidgetViews.cpp +++ b/src/views/animated/SkWidgetViews.cpp @@ -24,8 +24,6 @@ enum SkinEnum { }; */ -SK_DEFINE_INST_COUNT(SkListSource) - const char* get_skin_enum_path(SkinEnum se) { SkASSERT((unsigned)se < kSkinEnumCount); diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp index f6b5659161..3f719e6422 100644 --- a/tests/GrMemoryPoolTest.cpp +++ b/tests/GrMemoryPoolTest.cpp @@ -67,7 +67,7 @@ private: static SkAutoTDelete<GrMemoryPool> gPool; char fChar; }; -SK_DEFINE_INST_COUNT(A); + SkAutoTDelete<GrMemoryPool> A::gPool; class B : public A { diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp index 6b373e33ac..128b11ed5b 100644 --- a/tests/LListTest.cpp +++ b/tests/LListTest.cpp @@ -28,8 +28,6 @@ private: SK_DECLARE_INTERNAL_LLIST_INTERFACE(ListElement); }; -SK_DEFINE_INST_COUNT(ListElement); - static void check_list(const SkTInternalLList<ListElement>& list, skiatest::Reporter* reporter, bool empty, diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp index 38a990a439..7d33f9b802 100644 --- a/tests/RefDictTest.cpp +++ b/tests/RefDictTest.cpp @@ -15,8 +15,6 @@ private: typedef SkRefCnt INHERITED; }; -SK_DEFINE_INST_COUNT(TestRC) - static void TestRefDict(skiatest::Reporter* reporter) { TestRC data0, data1; SkRefDict dict; diff --git a/tests/Test.cpp b/tests/Test.cpp index 61e16533e4..fe0f7c4a6b 100644 --- a/tests/Test.cpp +++ b/tests/Test.cpp @@ -19,8 +19,6 @@ class GrContext; #endif -SK_DEFINE_INST_COUNT(skiatest::Reporter) - using namespace skiatest; Reporter::Reporter() : fTestCount(0) { diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp index cb0668ed09..d7d67c2b8e 100644 --- a/tests/UtilsTest.cpp +++ b/tests/UtilsTest.cpp @@ -25,8 +25,6 @@ private: typedef SkRefCnt INHERITED; }; -SK_DEFINE_INST_COUNT(RefClass) - static void test_autounref(skiatest::Reporter* reporter) { RefClass obj(0); REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); |