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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/bitmapfilters.cpp | 6 | ||||
| -rw-r--r-- | gm/composeshader.cpp | 6 | ||||
| -rw-r--r-- | gm/gmmain.cpp | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp index 3b563dd53b..92c7b43dbb 100644 --- a/gm/bitmapfilters.cpp +++ b/gm/bitmapfilters.cpp @@ -101,12 +101,6 @@ protected: 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); } diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 33d467be57..f74a19e0a3 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -59,12 +59,6 @@ protected: 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; diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index e79831a0ff..b78fb9e8a9 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -628,7 +628,7 @@ struct PipeFlagComboData { 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 } }; |