From a2ca41e3afdd8fad5e0e924dec029f33918e0a67 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 23 Mar 2012 19:00:34 +0000 Subject: Cleanup Macros arround static initializers for SkFlattenable. This CL also removes an unused debugging function from the class Review URL: https://codereview.appspot.com/5890043 git-svn-id: http://skia.googlecode.com/svn/trunk@3483 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkBitmapProcShader.h | 1 - src/core/SkFlattenable.cpp | 4 -- src/core/SkPathEffect.cpp | 8 ++-- src/core/SkShader.cpp | 3 ++ src/effects/Sk2DPathEffect.cpp | 3 +- src/effects/SkEffects.cpp | 53 -------------------- src/effects/SkGradientShader.cpp | 4 -- src/effects/SkTableColorFilter.cpp | 4 ++ src/effects/SkTestImageFilters.cpp | 5 ++ src/ports/SkGlobalInitialization_chromium.cpp | 20 ++++---- src/ports/SkGlobalInitialization_default.cpp | 69 ++++++++++++++++++++++++--- src/utils/SkDumpCanvas.cpp | 7 +-- 12 files changed, 92 insertions(+), 89 deletions(-) delete mode 100644 src/effects/SkEffects.cpp (limited to 'src') diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h index 4f8d0c5667..cd702793d1 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/core/SkBitmapProcShader.h @@ -37,7 +37,6 @@ public: // override from flattenable virtual bool toDumpString(SkString* str) const; - SK_DECLARE_FLATTENABLE_REGISTRAR() protected: SkBitmapProcShader(SkFlattenableReadBuffer& ); virtual void flatten(SkFlattenableWriteBuffer& ); diff --git a/src/core/SkFlattenable.cpp b/src/core/SkFlattenable.cpp index 59a262ada9..9d8c215a8c 100644 --- a/src/core/SkFlattenable.cpp +++ b/src/core/SkFlattenable.cpp @@ -383,7 +383,3 @@ const char* SkFlattenable::FactoryToName(Factory fact) { } return NULL; } - -bool SkFlattenable::toDumpString(SkString* str) const { - return false; -} diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp index d81ac9ff3d..852c25f9da 100644 --- a/src/core/SkPathEffect.cpp +++ b/src/core/SkPathEffect.cpp @@ -134,9 +134,7 @@ SkStrokePathEffect::SkStrokePathEffect(SkFlattenableReadBuffer& buffer) { /////////////////////////////////////////////////////////////////////////////// -SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkPathEffect) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStrokePathEffect) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect) -SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END +SK_DEFINE_FLATTENABLE_REGISTRAR(SkComposePathEffect) +SK_DEFINE_FLATTENABLE_REGISTRAR(SkStrokePathEffect) +SK_DEFINE_FLATTENABLE_REGISTRAR(SkSumPathEffect) diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index ce7ff9ef66..618b8d2745 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -333,6 +333,8 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const { return kColor_GradientType; } +SK_DEFINE_FLATTENABLE_REGISTRAR(SkColorShader) + /////////////////////////////////////////////////////////////////////////////// #include "SkEmptyShader.h" @@ -363,3 +365,4 @@ void SkEmptyShader::flatten(SkFlattenableWriteBuffer& buffer) { this->INHERITED::flatten(buffer); } +SK_DEFINE_FLATTENABLE_REGISTRAR(SkEmptyShader) diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp index 37296108cb..23037f7abc 100644 --- a/src/effects/Sk2DPathEffect.cpp +++ b/src/effects/Sk2DPathEffect.cpp @@ -117,5 +117,6 @@ void SkPath2DPathEffect::next(const SkPoint& loc, int u, int v, SkPath* dst) { dst->addPath(fPath, loc.fX, loc.fY); } -SK_DEFINE_FLATTENABLE_REGISTRAR(SkPath2DPathEffect) +/////////////////////////////////////////////////////////////////////////////// +SK_DEFINE_FLATTENABLE_REGISTRAR(SkPath2DPathEffect) diff --git a/src/effects/SkEffects.cpp b/src/effects/SkEffects.cpp deleted file mode 100644 index d4ccac0600..0000000000 --- a/src/effects/SkEffects.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkTypes.h" - -#if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS - -#include "Sk1DPathEffect.h" -#include "Sk2DPathEffect.h" -#include "SkAvoidXfermode.h" -#include "SkBlurDrawLooper.h" -#include "SkBlurImageFilter.h" -#include "SkBlurMaskFilter.h" -#include "SkColorFilter.h" -#include "SkColorMatrixFilter.h" -#include "SkCornerPathEffect.h" -#include "SkDashPathEffect.h" -#include "SkDiscretePathEffect.h" -#include "SkEffects.h" -#include "SkFlattenable.h" -#include "SkGradientShader.h" -#include "SkGroupShape.h" -#include "SkLayerDrawLooper.h" -#include "SkLayerRasterizer.h" -#include "SkPathEffect.h" -#include "SkPixelXorXfermode.h" -#include "SkRectShape.h" - -void SkEffects::Init() { - SkAvoidXfermode::Init(); - SkBlurDrawLooper::Init(); - SkBlurImageFilter::Init(); - SkBlurMaskFilter::Init(); - SkColorFilter::Init(); - SkColorMatrixFilter::Init(); - SkCornerPathEffect::Init(); - SkDashPathEffect::Init(); - SkDiscretePathEffect::Init(); - SkGradientShader::Init(); - SkGroupShape::Init(); - SkLayerDrawLooper::Init(); - SkLayerRasterizer::Init(); - SkPath1DPathEffect::Init(); - SkPath2DPathEffect::Init(); - SkPixelXorXfermode::Init(); - SkRectShape::Init(); -} - -#endif diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 4bbc96c42f..c9929b4180 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -861,8 +861,6 @@ public: buffer.writeScalar(fEnd.fY); } - SK_DECLARE_FLATTENABLE_REGISTRAR() - protected: Linear_Gradient(SkFlattenableReadBuffer& buffer) : Gradient_Shader(buffer), @@ -2559,8 +2557,6 @@ SkShader* SkGradientShader::CreateSweep(SkScalar cx, SkScalar cy, SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkGradientShader) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Linear_Gradient) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Radial_Gradient) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Sweep_Gradient) - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Two_Point_Radial_Gradient) SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 800d4a9ce4..5d71e239e9 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -218,3 +218,7 @@ SkColorFilter* SkTableColorFilter::CreateARGB(const uint8_t tableA[256], const uint8_t tableB[256]) { return SkNEW_ARGS(SkTable_ColorFilter, (tableA, tableR, tableG, tableB)); } + +SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkTableColorFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTable_ColorFilter) +SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp index a772f64510..6378bc68b8 100755 --- a/src/effects/SkTestImageFilters.cpp +++ b/src/effects/SkTestImageFilters.cpp @@ -399,3 +399,8 @@ SkFlattenable::Factory SkDownSampleImageFilter::getFactory() { return CreateProc; } +SK_DEFINE_FLATTENABLE_REGISTRAR(SkOffsetImageFilter) +SK_DEFINE_FLATTENABLE_REGISTRAR(SkComposeImageFilter) +SK_DEFINE_FLATTENABLE_REGISTRAR(SkMergeImageFilter) +SK_DEFINE_FLATTENABLE_REGISTRAR(SkColorFilterImageFilter) +SK_DEFINE_FLATTENABLE_REGISTRAR(SkDownSampleImageFilter) diff --git a/src/ports/SkGlobalInitialization_chromium.cpp b/src/ports/SkGlobalInitialization_chromium.cpp index 6a7b213944..5a2119e5dd 100644 --- a/src/ports/SkGlobalInitialization_chromium.cpp +++ b/src/ports/SkGlobalInitialization_chromium.cpp @@ -17,15 +17,17 @@ #include "SkXfermode.h" void SkFlattenable::InitializeFlattenables() { - SkBitmapProcShader::Init(); - SkBlurImageFilter::Init(); - SkBlurMaskFilter::Init(); - SkColorFilter::Init(); - SkCornerPathEffect::Init(); - SkDashPathEffect::Init(); - SkGradientShader::Init(); - SkLayerDrawLooper::Init(); - SkXfermode::Init(); + + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper) + + SkBlurMaskFilter::InitializeFlattenables(); + SkColorFilter::InitializeFlattenables(); + SkGradientShader::InitializeFlattenables(); + SkXfermode::InitializeFlattenables(); } void SkPixelRef::InitializeFlattenables() { diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 6be776a0fd..a03b922000 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -10,7 +10,6 @@ #if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS #include "SkBitmapProcShader.h" -#include "SkEffects.h" #include "SkFlipPixelRef.h" #include "SkImageRef_ashmem.h" #include "SkImageRef_GlobalPool.h" @@ -20,12 +19,70 @@ #include "SkShape.h" #include "SkXfermode.h" +#include "Sk1DPathEffect.h" +#include "Sk2DPathEffect.h" +#include "SkAvoidXfermode.h" +#include "SkBlurDrawLooper.h" +#include "SkBlurImageFilter.h" +#include "SkBlurMaskFilter.h" +#include "SkColorFilter.h" +#include "SkColorMatrixFilter.h" +#include "SkColorShader.h" +#include "SkCornerPathEffect.h" +#include "SkDashPathEffect.h" +#include "SkDiscretePathEffect.h" +#include "SkEmptyShader.h" +#include "SkFlattenable.h" +#include "SkGradientShader.h" +#include "SkGroupShape.h" +#include "SkLayerDrawLooper.h" +#include "SkLayerRasterizer.h" +#include "SkMorphologyImageFilter.h" +#include "SkPathEffect.h" +#include "SkPixelXorXfermode.h" +#include "SkRectShape.h" +#include "SkTableColorFilter.h" +#include "SkTestImageFilters.h" + void SkFlattenable::InitializeFlattenables() { - SkBitmapProcShader::Init(); - SkEffects::Init(); - SkPathEffect::Init(); - SkShape::Init(); - SkXfermode::Init(); + + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkGroupShape) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShape) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStrokePathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkShape) + + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter) + + SkBlurMaskFilter::InitializeFlattenables(); + SkColorFilter::InitializeFlattenables(); + SkGradientShader::InitializeFlattenables(); + SkTableColorFilter::InitializeFlattenables(); + SkXfermode::InitializeFlattenables(); + + } void SkPixelRef::InitializeFlattenables() { diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index 3b28fe766d..72a5c9299c 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -415,12 +415,7 @@ static void appendPtr(SkString* str, const void* ptr, const char name[]) { static void appendFlattenable(SkString* str, const SkFlattenable* ptr, const char name[]) { if (ptr) { - SkString info; - if (ptr->toDumpString(&info)) { - str->appendf(" %s", info.c_str()); - } else { - str->appendf(" %s:%p", name, ptr); - } + str->appendf(" %s:%p", name, ptr); } } -- cgit v1.2.3