diff options
author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-23 19:00:34 +0000 |
---|---|---|
committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-23 19:00:34 +0000 |
commit | a2ca41e3afdd8fad5e0e924dec029f33918e0a67 (patch) | |
tree | 9c9c6351208fbb106b8de9d9bcf6556f1aac9e60 /src/ports | |
parent | 52c5cbf56621c34b508765e32c137c044eff4940 (diff) |
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
Diffstat (limited to 'src/ports')
-rw-r--r-- | src/ports/SkGlobalInitialization_chromium.cpp | 20 | ||||
-rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 69 |
2 files changed, 74 insertions, 15 deletions
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() { |