From b3c0f4886e22b6d2041c1049a1f295943959fff1 Mon Sep 17 00:00:00 2001 From: scroggo Date: Mon, 2 Jul 2012 19:07:57 +0000 Subject: 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 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gm/bitmapfilters.cpp') 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); } -- cgit v1.2.3