AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Provide static global initializers for SkColorTable and SkComposeShader.

Browse Source 
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
This commit is contained in:
scroggo 2012-07-02 19:07:57 +00:00
parent 126b4362be
commit b3c0f4886e
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gm/bitmapfilters.cpp
View File

@ -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);
}

6
gm/composeshader.cpp
View File

@ -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;

2
gm/gmmain.cpp
View File

@ -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 }
};

4
src/ports/SkGlobalInitialization_default.cpp
View File

@ -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)