diff options
| author |  scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-02 19:07:57 +0000 |
|---|---|---|
| committer | scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-02 19:07:57 +0000 |
| commit | b3c0f4886e22b6d2041c1049a1f295943959fff1 (patch) | |
| tree | b1cb5c79ea41e0aa142d33b330733e1f4c56b1d1 /src | |
| parent | 126b4362be3bb43ef8f7a10df710b40e8bba869d (diff) | |
Provide static global initializers for SkColorTable and SkComposeShader.
This makes some GMs which were broken on Android work. Reenable them on
Android.
Also fix a typo in gmmain.
Review URL: https://codereview.appspot.com/6344069
git-svn-id: http://skia.googlecode.com/svn/trunk@4426 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 259ec440a7..4f99c9ede9 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -28,6 +28,8 @@ #include "SkColorFilter.h" #include "SkColorMatrixFilter.h" #include "SkColorShader.h" +#include "SkColorTable.h" +#include "SkComposeShader.h" #include "SkCornerPathEffect.h" #include "SkDashPathEffect.h" #include "SkDiscretePathEffect.h" @@ -55,7 +57,9 @@ void SkFlattenable::InitializeFlattenables() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorTable) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter) |