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/core | |
| 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/core')
| -rw-r--r-- | src/core/SkBitmapProcShader.h | 1 | ||||
| -rw-r--r-- | src/core/SkFlattenable.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkPathEffect.cpp | 8 | ||||
| -rw-r--r-- | src/core/SkShader.cpp | 3 |
4 files changed, 6 insertions, 10 deletions
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) |