commit b3c0f4886e22b6d2041c1049a1f295943959fff1
author scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 02 19:07:57 2012 +0000
committer scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 02 19:07:57 2012 +0000
tree b1cb5c79ea41e0aa142d33b330733e1f4c56b1d1
parent 126b4362be3bb43ef8f7a10df710b40e8bba869d

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

gm/bitmapfilters.cpp

diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 3b563dd..92c7b43 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -101,12 +101,6 @@
         return SkString("bitmapfilters");
     }
 
-#ifdef SK_BUILD_FOR_ANDROID
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
-        return this->INHERITED::onGetFlags() | GM::kSkipPipe_Flag;
-    }
-#endif
-
 	virtual SkISize onISize() {
         return make_isize(540, 330);
     }

gm/composeshader.cpp

diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index 33d467b..f74a19e0 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -59,12 +59,6 @@
         return make_isize(640, 480);
     }
 
-#ifdef SK_BUILD_FOR_ANDROID
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
-        return this->INHERITED::onGetFlags() | GM::kSkipPipe_Flag;
-    }
-#endif
-
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkPaint paint;

gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index e79831a..b78fb9e 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -628,7 +628,7 @@
 static PipeFlagComboData gPipeWritingFlagCombos[] = {
     { "", 0 },
     { " cross-process", SkGPipeWriter::kCrossProcess_Flag },
-    { " cross-process, shared adress", SkGPipeWriter::kCrossProcess_Flag
+    { " cross-process, shared address", SkGPipeWriter::kCrossProcess_Flag
         | SkGPipeWriter::kSharedAddressSpace_SkGPipeFlag }
 };
 

src/ports/SkGlobalInitialization_default.cpp

diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 259ec44..4f99c9e 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 @@
     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)