diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-23 11:07:07 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-23 11:07:08 -0800 |
| commit | 1c4029296f518a84ef90095243ba210163a1e1f9 (patch) | |
| tree | 11136d02e081edc4f2367b8448ee76e2dd856fed | |
| parent | a3ca15c314c72d1e4ffff38d0937a382c1e6d2de (diff) | |
remove unused GM flags
Depends on https://codereview.chromium.org/873753002/
Thumbs up to CLion for refactoring this for me.
BUG=skia:
Review URL: https://codereview.chromium.org/867963004
130 files changed, 9 insertions, 623 deletions
diff --git a/bench/GMBench.cpp b/bench/GMBench.cpp index bdf32904e8..bcc83eb18c 100644 --- a/bench/GMBench.cpp +++ b/bench/GMBench.cpp @@ -18,22 +18,7 @@ const char* GMBench::onGetName() { } bool GMBench::isSuitableFor(Backend backend) { - uint32_t flags = fGM->getFlags(); - switch (backend) { - case kGPU_Backend: - return !(skiagm::GM::kSkipGPU_Flag & flags); - case kPDF_Backend: - return !(skiagm::GM::kSkipPDF_Flag & flags); - case kRaster_Backend: - // GM doesn't have an equivalent flag. If the GM has known issues with 565 then - // we skip it for ALL raster configs in bench. - return !(skiagm::GM::kSkip565_Flag & flags); - case kNonRendering_Backend: - return false; - default: - SkDEBUGFAIL("Unexpected backend type."); - return false; - } + return kNonRendering_Backend != backend; } void GMBench::onDraw(const int loops, SkCanvas* canvas) { diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp index 6ac9f0b17b..e977f5f05f 100644 --- a/gm/aaclip.cpp +++ b/gm/aaclip.cpp @@ -101,8 +101,6 @@ protected: draw_rect_tests(canvas); } - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } - private: typedef skiagm::GM INHERITED; }; @@ -187,8 +185,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp index 3c9a6831ae..83456a011e 100644 --- a/gm/aarectmodes.cpp +++ b/gm/aarectmodes.cpp @@ -133,9 +133,6 @@ namespace skiagm { } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("aarectmodes"); diff --git a/gm/alphagradients.cpp b/gm/alphagradients.cpp index 4fd11ad206..304c523ac5 100644 --- a/gm/alphagradients.cpp +++ b/gm/alphagradients.cpp @@ -72,8 +72,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp index 7748f34dd8..9aa4bb4c39 100644 --- a/gm/arcofzorro.cpp +++ b/gm/arcofzorro.cpp @@ -20,9 +20,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("arcofzorro"); diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index b96952a1e0..e49fc91a86 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -44,11 +44,6 @@ protected: return SkISize::Make(800, 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - // This is a GPU-specific GM. - return kGPUOnly_Flag; - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); @@ -204,11 +199,6 @@ protected: return SkISize::Make(800, 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - // This is a GPU-specific GM. - return kGPUOnly_Flag; - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); @@ -397,11 +387,6 @@ protected: return SkISize::Make(800, 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - // This is a GPU-specific GM. - return kGPUOnly_Flag; - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); diff --git a/gm/beziers.cpp b/gm/beziers.cpp index a35f2a6046..5ad34fb633 100755 --- a/gm/beziers.cpp +++ b/gm/beziers.cpp @@ -46,9 +46,6 @@ public: BeziersGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("beziers"); diff --git a/gm/bigtext.cpp b/gm/bigtext.cpp index bdb31769ca..4fe77cc71a 100644 --- a/gm/bigtext.cpp +++ b/gm/bigtext.cpp @@ -19,9 +19,6 @@ public: BigTextGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("bigtext"); diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index 74505d911d..32e91e3cec 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -114,9 +114,6 @@ protected: } } - virtual uint32_t onGetFlags() const { return kSkipPicture_Flag - | kSkipPipe_Flag; } - private: typedef GM INHERITED; }; diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp index ae505bf00d..8fb56f5fca 100644 --- a/gm/bitmaprect.cpp +++ b/gm/bitmaprect.cpp @@ -45,13 +45,6 @@ protected: return SkISize::Make(640, 480); } -#ifdef SK_CPU_ARM64 - // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } -#endif - void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(0xFFCCCCCC); @@ -271,7 +264,7 @@ protected: canvas->drawRect(r, paint); canvas->drawBitmapRect(fBM, NULL, r, NULL); } - + private: typedef skiagm::GM INHERITED; }; diff --git a/gm/bitmapscroll.cpp b/gm/bitmapscroll.cpp index d5c3051172..9f8aacae54 100644 --- a/gm/bitmapscroll.cpp +++ b/gm/bitmapscroll.cpp @@ -63,10 +63,6 @@ protected: return SkString("bitmapscroll"); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } diff --git a/gm/bleed.cpp b/gm/bleed.cpp index e361926d70..f39f3a111d 100644 --- a/gm/bleed.cpp +++ b/gm/bleed.cpp @@ -85,9 +85,6 @@ public: BleedGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("bleed"); diff --git a/gm/blurcircles.cpp b/gm/blurcircles.cpp index 0e7f916d40..ee30200d36 100644 --- a/gm/blurcircles.cpp +++ b/gm/blurcircles.cpp @@ -19,9 +19,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index a47b9cdc14..fb3ee37903 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -147,8 +147,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } - private: void drawProcs(SkCanvas* canvas, const SkRect& r, const SkPaint& paint, bool doClip, const Proc procs[], size_t procsCount) { @@ -248,8 +246,6 @@ protected: } } - virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; } - private: typedef GM INHERITED; }; @@ -320,8 +316,6 @@ protected: canvas->drawBitmap(bm, SkIntToScalar(center_x), SkIntToScalar(center_y), NULL); } - virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; } - private: typedef GM INHERITED; }; diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index c8468fe83e..45a110315f 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -126,9 +126,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/blurs.cpp b/gm/blurs.cpp index d5bb7d2415..96a9e30401 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -16,9 +16,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("blurs"); diff --git a/gm/circles.cpp b/gm/circles.cpp index b513ccba7b..c0503fdc1d 100644 --- a/gm/circles.cpp +++ b/gm/circles.cpp @@ -25,9 +25,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("circles"); diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp index 69e8b69a8f..ec766fbca4 100644 --- a/gm/circularclips.cpp +++ b/gm/circularclips.cpp @@ -25,9 +25,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } bool runAsBench() const SK_OVERRIDE { return true; } diff --git a/gm/clip_strokerect.cpp b/gm/clip_strokerect.cpp index f7c18e73e6..a0dc7fd2ff 100644 --- a/gm/clip_strokerect.cpp +++ b/gm/clip_strokerect.cpp @@ -63,8 +63,6 @@ protected: canvas->drawRect(rect2, p); } - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/colorfilters.cpp b/gm/colorfilters.cpp index 9f278a5b40..9ecb56cd7e 100644 --- a/gm/colorfilters.cpp +++ b/gm/colorfilters.cpp @@ -49,10 +49,6 @@ protected: return SkISize::Make(640, 480); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkRect r; diff --git a/gm/colortype.cpp b/gm/colortype.cpp index 9b541fa857..c75a16635f 100644 --- a/gm/colortype.cpp +++ b/gm/colortype.cpp @@ -60,10 +60,6 @@ protected: } } - virtual uint32_t onGetFlags() const { - return kSkipPipe_Flag | kSkipPicture_Flag; - } - private: SkTypeface* fColorType; diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp index cd1b249cd1..51cb7eb7c3 100644 --- a/gm/colortypexfermode.cpp +++ b/gm/colortypexfermode.cpp @@ -156,10 +156,6 @@ protected: s->unref(); } - virtual uint32_t onGetFlags() const { - return kSkipPipe_Flag | kSkipPicture_Flag; - } - private: SkTypeface* fColorType; diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index f3d5a33d19..5603655fad 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -27,9 +27,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp index 64cf3c83a0..a55d0733e0 100644 --- a/gm/complexclip2.cpp +++ b/gm/complexclip2.cpp @@ -111,13 +111,6 @@ protected: return ""; } - uint32_t onGetFlags() const SK_OVERRIDE { - if (kRect_Clip != fClip) { - return kSkipTiled_Flag; - } - return 0; - } - virtual SkString onShortName() { if (kRect_Clip == fClip && !fAntiAlias) { return SkString("complexclip2"); diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp index bae5c5a774..afabcf69d8 100644 --- a/gm/complexclip3.cpp +++ b/gm/complexclip3.cpp @@ -21,9 +21,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { SkString str; diff --git a/gm/conicpaths.cpp b/gm/conicpaths.cpp index d04cd26359..a5d5ee6d24 100644 --- a/gm/conicpaths.cpp +++ b/gm/conicpaths.cpp @@ -106,12 +106,6 @@ protected: canvas->restore(); } - uint32_t onGetFlags() const SK_OVERRIDE { - // tiling w/ non-antialias paths can cause off-by-1-pixels differences which are - // unavoidable (chopping in floats -vs- stepping in scan-converter). - return kSkipTiled_Flag; - } - private: SkTArray<SkPath> fPaths; typedef skiagm::GM INHERITED; diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp index 01497b5ab1..889d65b189 100644 --- a/gm/convexpaths.cpp +++ b/gm/convexpaths.cpp @@ -34,9 +34,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } virtual SkString onShortName() { return SkString("convexpaths"); diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index 0ec45b7647..8d54b00cd0 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -214,10 +214,6 @@ protected: } } - virtual uint32_t onGetFlags() const { - return kSkipTiled_Flag; - } - bool runAsBench() const SK_OVERRIDE { return true; } private: diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index c92fd93390..6e4705745b 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -42,11 +42,6 @@ protected: return SkISize::Make(720, 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - // This is a GPU-specific GM. - return kGPUOnly_Flag; - } - void onOnceBeforeDraw() SK_OVERRIDE { SkPath tri; tri.moveTo(5.f, 5.f); diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index bf05db7845..3dd230c219 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -16,9 +16,6 @@ public: ClippedCubicGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("clippedcubic"); @@ -59,9 +56,6 @@ public: CubicPathGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("cubicpath"); @@ -208,9 +202,6 @@ public: CubicClosePathGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("cubicclosepath"); diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp index 3d2d8d1413..9a7d6d7482 100644 --- a/gm/dashcubics.cpp +++ b/gm/dashcubics.cpp @@ -20,9 +20,6 @@ public: DashCubicsGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } virtual SkString onShortName() { return SkString("dashcubics"); diff --git a/gm/dashing.cpp b/gm/dashing.cpp index a3d6094067..ba3ede4fcd 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -49,9 +49,6 @@ public: DashingGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("dashing"); @@ -136,9 +133,6 @@ public: Dashing2GM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("dashing2"); @@ -198,9 +192,6 @@ public: Dashing3GM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("dashing3"); @@ -331,9 +322,6 @@ public: Dashing4GM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("dashing4"); @@ -414,7 +402,6 @@ public: Dashing5GM(bool doAA) : fDoAA(doAA) {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } bool runAsBench() const SK_OVERRIDE { return true; } diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index 07af695e47..c08923f4c3 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -113,9 +113,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kGPUOnly_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("dcshader"); diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp index 09de2eed36..e5ca18796a 100644 --- a/gm/degeneratesegments.cpp +++ b/gm/degeneratesegments.cpp @@ -22,10 +22,6 @@ protected: const char* fName2; }; - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - SkString onShortName() { return SkString("degeneratesegments"); } diff --git a/gm/dftext.cpp b/gm/dftext.cpp index 30b82d7723..d6e19f67b5 100755 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -34,10 +34,6 @@ protected: fTypeface = SkTypeface::CreateFromStream(stream.detach()); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kGPUOnly_Flag; - } - SkString onShortName() SK_OVERRIDE { return SkString("dftext"); } diff --git a/gm/discard.cpp b/gm/discard.cpp index 19a332fa15..fc271d27c2 100644 --- a/gm/discard.cpp +++ b/gm/discard.cpp @@ -25,8 +25,6 @@ public: DiscardGM() { } - uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } - protected: SkString onShortName() SK_OVERRIDE { return SkString("discard"); diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index 600d2caee2..d7be6378f2 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -56,9 +56,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; @@ -205,11 +202,6 @@ public: } protected: -#if 0 - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } -#endif SkString onShortName() SK_OVERRIDE { return SkString("showmiplevels"); @@ -241,7 +233,7 @@ protected: } } } - + private: typedef skiagm::GM INHERITED; }; diff --git a/gm/dropshadowimagefilter.cpp b/gm/dropshadowimagefilter.cpp index 5a8c7a2a8b..f60f22c70f 100644 --- a/gm/dropshadowimagefilter.cpp +++ b/gm/dropshadowimagefilter.cpp @@ -111,14 +111,6 @@ protected: canvas->drawRect(r, paint); } - virtual uint32_t onGetFlags() const { - // Because of the use of drawSprite, this test is excluded - // from scaled replay tests because drawSprite ignores the - // reciprocal scale that is applied at record time, which is - // the intended behavior of drawSprite. - return kSkipScaledReplay_Flag | kSkipTiled_Flag; - } - virtual void onDraw(SkCanvas* canvas) { void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = { draw_sprite, draw_bitmap, draw_path, draw_paint, draw_text diff --git a/gm/drrect.cpp b/gm/drrect.cpp index 16c45b745e..fd5a93651b 100644 --- a/gm/drrect.cpp +++ b/gm/drrect.cpp @@ -15,9 +15,6 @@ public: DRRectGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("drrect"); diff --git a/gm/factory.cpp b/gm/factory.cpp index a2dc4dd282..1e89d3df72 100644 --- a/gm/factory.cpp +++ b/gm/factory.cpp @@ -53,11 +53,6 @@ protected: canvas->drawBitmap(fBitmap, 0, 0); } - // Skip cross process pipe due to https://code.google.com/p/skia/issues/detail?id=1520 - virtual uint32_t onGetFlags() const { - return INHERITED::onGetFlags() | kSkipPipeCrossProcess_Flag; - } - private: SkBitmap fBitmap; diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp index e4b8a8d2cd..1d269a0289 100644 --- a/gm/fatpathfill.cpp +++ b/gm/fatpathfill.cpp @@ -56,9 +56,6 @@ public: FatPathFillGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } virtual SkString onShortName() { return SkString("fatpathfill"); diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp index 0d7e2c63e6..19249b27bc 100644 --- a/gm/filltypes.cpp +++ b/gm/filltypes.cpp @@ -25,9 +25,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("filltypes"); diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp index cfdb0150d8..c76a0fa4e7 100644 --- a/gm/filltypespersp.cpp +++ b/gm/filltypespersp.cpp @@ -24,9 +24,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("filltypespersp"); diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 57041fb62d..66f9d34d7c 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -70,9 +70,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp index def7b37833..206903f3eb 100644 --- a/gm/filterfastbounds.cpp +++ b/gm/filterfastbounds.cpp @@ -160,15 +160,6 @@ protected: static const int kNumVertTiles = 6; static const int kNumXtraCols = 2; - // SkPictureImageFilter doesn't support serialization yet. - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipPicture_Flag | - kSkipPipe_Flag | - kSkipPipeCrossProcess_Flag | - kSkipTiled_Flag | - kSkipScaledReplay_Flag; - } - SkString onShortName() SK_OVERRIDE{ return SkString("filterfastbounds"); } SkISize onISize() SK_OVERRIDE{ diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index 35ccf6e62d..1ed2a6924f 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -74,13 +74,6 @@ protected: return fName; } -#ifdef SK_CPU_ARM64 - // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } -#endif - SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 768); } diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index 3363e24ba3..2aa70115dd 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -88,11 +88,6 @@ protected: } - uint32_t onGetFlags() const SK_OVERRIDE { - // this GM is meant only for the GPU - return kGPUOnly_Flag; - } - private: SkTypeface* fTypefaces[TYPEFACE_COUNT]; typedef GM INHERITED; diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 9d0e3509f1..e89e585fde 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -115,16 +115,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { - // fontdescriptors (and therefore serialization) don't yet understand - // these new styles, so skip tests that exercise that for now. - - // If certain fonts are picked up (e.g. Microsoft Jhenghei 20MB for Regular, 12MB for Bold), - // the resulting pdf can be ~700MB and crashes Chrome's PDF viewer. - - return kSkipPicture_Flag | kSkipPipe_Flag | kSkipPDF_Flag; - } - private: SkAutoTUnref<SkFontMgr> fFM; SkString fName; @@ -214,12 +204,6 @@ protected: this->iterateFamily(canvas, paint, fset); } - uint32_t onGetFlags() const SK_OVERRIDE { - // fontdescriptors (and therefore serialization) don't yet understand - // these new styles, so skip tests that exercise that for now. - return kSkipPicture_Flag | kSkipPipe_Flag; - } - private: typedef GM INHERITED; }; @@ -299,17 +283,7 @@ protected: } } } - - uint32_t onGetFlags() const SK_OVERRIDE { - // fontdescriptors (and therefore serialization) don't yet understand - // these new styles, so skip tests that exercise that for now. - - // If certain fonts are picked up (e.g. Microsoft Jhenghei 20MB for Regular, 12MB for Bold), - // the resulting pdf can be ~700MB and crashes Chrome's PDF viewer. - - return kSkipPicture_Flag | kSkipPipe_Flag | kSkipPDF_Flag; - } - + private: SkAutoTUnref<SkFontMgr> fFM; SkString fName; diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp index 99af04e911..3fefd56080 100644 --- a/gm/fontscaler.cpp +++ b/gm/fontscaler.cpp @@ -19,9 +19,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("fontscaler"); diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp index c5e01b69a6..db50969744 100644 --- a/gm/getpostextpath.cpp +++ b/gm/getpostextpath.cpp @@ -16,9 +16,6 @@ public: GetPosTextPathGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("getpostextpath"); diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp index d38226986b..2ac952daf4 100644 --- a/gm/giantbitmap.cpp +++ b/gm/giantbitmap.cpp @@ -71,16 +71,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { -#ifdef SK_BUILD_FOR_ANDROID - return kSkipTiled_Flag; -#else - if (fDoFilter && fDoRotate && fMode != SkShader::kClamp_TileMode) { - return kSkipTiled_Flag; - } - return 0; -#endif - } SkString onShortName() SK_OVERRIDE { SkString str("giantbitmap_"); diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index 893de13a7d..3f1ea35e0a 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -27,9 +27,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { SkString str("glyph_pos"); diff --git a/gm/glyph_pos_align.cpp b/gm/glyph_pos_align.cpp index ef2eae24ab..031476098d 100644 --- a/gm/glyph_pos_align.cpp +++ b/gm/glyph_pos_align.cpp @@ -21,9 +21,6 @@ namespace skiagm { class GlyphPosAlignGM : public GM { protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("glyph_pos_align"); @@ -40,22 +40,6 @@ namespace skiagm { GM(); virtual ~GM(); - enum Flags { - kSkipPDF_Flag = 1 << 0, - kSkipPicture_Flag = 1 << 1, - kSkipPipe_Flag = 1 << 2, - kSkipPipeCrossProcess_Flag = 1 << 3, - kSkipTiled_Flag = 1 << 4, - kSkip565_Flag = 1 << 5, - kSkipScaledReplay_Flag = 1 << 6, - kSkipGPU_Flag = 1 << 7, - kSkipPDFRasterization_Flag = 1 << 8, - - kGPUOnly_Flag = 1 << 9, - - kNoBBH_Flag = 1 << 11, // May draw wrong using a bounding-box hierarchy - }; - enum Mode { kGM_Mode, kSample_Mode, @@ -74,10 +58,6 @@ namespace skiagm { virtual bool runAsBench() const { return false; } - uint32_t getFlags() const { - return this->onGetFlags(); - } - SkScalar width() { return SkIntToScalar(this->getISize().width()); } @@ -118,7 +98,7 @@ namespace skiagm { virtual void onDrawBackground(SkCanvas*); virtual SkISize onISize() = 0; virtual SkString onShortName() = 0; - virtual uint32_t onGetFlags() const { return 0; } + virtual SkMatrix onGetInitialTransform() const { return SkMatrix::I(); } private: diff --git a/gm/gradient_matrix.cpp b/gm/gradient_matrix.cpp index 94f40cba86..daeea37aef 100644 --- a/gm/gradient_matrix.cpp +++ b/gm/gradient_matrix.cpp @@ -120,9 +120,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("gradient_matrix"); diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 98093ab800..43f8c94e92 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -105,9 +105,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("gradients"); @@ -162,9 +159,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("gradients_local_perspective"); @@ -334,9 +328,6 @@ public: RadialGradientGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient"); } SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } @@ -377,9 +368,6 @@ public: RadialGradient2GM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient2"); } SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index 789137bf0e..c180209498 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -85,9 +85,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("gradients_no_texture"); } SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); } @@ -211,9 +208,6 @@ public: GradientsManyColorsGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); } SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); } diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index f2123df5d6..87c3b38968 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -106,10 +106,6 @@ protected: return SkString("gradtext"); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(500, 480); } static void draw_text(SkCanvas* canvas, const SkPaint& paint) { diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp index 286cc82d56..8b0510ce3e 100644 --- a/gm/hairlines.cpp +++ b/gm/hairlines.cpp @@ -13,9 +13,6 @@ namespace skiagm { class HairlinesGM : public GM { protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp index 46be078735..82a55ea193 100644 --- a/gm/hairmodes.cpp +++ b/gm/hairmodes.cpp @@ -121,9 +121,6 @@ namespace skiagm { } } - // disable pdf for now, since it crashes on mac - virtual uint32_t onGetFlags() const { return kSkipPDF_Flag | kSkipTiled_Flag; } - private: typedef GM INHERITED; }; diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp index 36a7cb4808..11fe834dd6 100644 --- a/gm/hittestpath.cpp +++ b/gm/hittestpath.cpp @@ -34,9 +34,6 @@ public: HitTestPathGM () {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("hittestpath"); diff --git a/gm/image.cpp b/gm/image.cpp index d980cb7562..ca28dd1119 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -188,10 +188,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { - return GM::kSkipPicture_Flag | GM::kSkipPipe_Flag; - } - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/imagealphathreshold.cpp b/gm/imagealphathreshold.cpp index b2259949c6..a6b00e4c94 100644 --- a/gm/imagealphathreshold.cpp +++ b/gm/imagealphathreshold.cpp @@ -21,13 +21,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return this->INHERITED::onGetFlags() | - GM::kSkipTiled_Flag | - GM::kSkipPicture_Flag | - GM::kSkipPipe_Flag | - GM::kSkipPipeCrossProcess_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("imagealphathreshold"); diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp index df1e8a2778..e424fbf8a2 100644 --- a/gm/imageblur.cpp +++ b/gm/imageblur.cpp @@ -23,9 +23,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/imageblur2.cpp b/gm/imageblur2.cpp index aafd01e5b5..978be7a039 100644 --- a/gm/imageblur2.cpp +++ b/gm/imageblur2.cpp @@ -36,9 +36,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index be8d402528..ea32769d4d 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -207,14 +207,6 @@ protected: canvas->drawRect(r, paint); } - virtual uint32_t onGetFlags() const { - // Because of the use of drawSprite, this test is excluded - // from scaled replay tests because drawSprite ignores the - // reciprocal scale that is applied at record time, which is - // the intended behavior of drawSprite. - return kSkipScaledReplay_Flag | kSkipTiled_Flag; - } - virtual void onDraw(SkCanvas* canvas) { void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = { draw_paint, diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index cfe9327a44..beb2e0977a 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -31,9 +31,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("imagefiltersclipped"); diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp index ad8fd5cc04..49b0a97f97 100644 --- a/gm/imagefilterscropped.cpp +++ b/gm/imagefilterscropped.cpp @@ -107,14 +107,6 @@ protected: canvas->drawRect(r, paint); } - virtual uint32_t onGetFlags() const { - // Because of the use of drawSprite, this test is excluded - // from scaled replay tests because drawSprite ignores the - // reciprocal scale that is applied at record time, which is - // the intended behavior of drawSprite. - return kSkipScaledReplay_Flag | kSkipTiled_Flag; - } - virtual void onDraw(SkCanvas* canvas) { void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = { draw_sprite, draw_bitmap, draw_path, draw_paint, draw_text diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index c66ee83ccf..4fa59a8766 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -102,9 +102,6 @@ public: ImageFiltersGraphGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } virtual SkString onShortName() { return SkString("imagefiltersgraph"); diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index d68f8cfcb8..b419187fff 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -31,9 +31,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } virtual SkString onShortName() { return SkString("imagefiltersscaled"); diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp index feac4c19cf..30be060460 100644 --- a/gm/imagemagnifier.cpp +++ b/gm/imagemagnifier.cpp @@ -21,10 +21,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - // Skip tiled drawing until https://code.google.com/p/skia/issues/detail?id=781 is fixed. - return this->INHERITED::onGetFlags() | GM::kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("imagemagnifier"); diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp index e8b46c47aa..6eb254cfe1 100644 --- a/gm/imageresizetiled.cpp +++ b/gm/imageresizetiled.cpp @@ -22,7 +22,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { return kNoBBH_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("imageresizetiled"); diff --git a/gm/inversepaths.cpp b/gm/inversepaths.cpp index 75edaaabc6..87a977a919 100644 --- a/gm/inversepaths.cpp +++ b/gm/inversepaths.cpp @@ -70,9 +70,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("inverse_paths"); diff --git a/gm/lcdtext.cpp b/gm/lcdtext.cpp index b207989a8b..1bcc346690 100644 --- a/gm/lcdtext.cpp +++ b/gm/lcdtext.cpp @@ -158,10 +158,6 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(230, 230); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkip565_Flag; - } - void onOnceBeforeDraw() SK_OVERRIDE { fInfo = SkImageInfo::MakeN32Premul(100, 100); SkPictureRecorder recorder; diff --git a/gm/lighting.cpp b/gm/lighting.cpp index 4952256068..7abfbceabc 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -20,9 +20,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("lighting"); diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp index 26e7a217d7..4fb66414fe 100644 --- a/gm/linepaths.cpp +++ b/gm/linepaths.cpp @@ -16,9 +16,6 @@ public: LinePathGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() { return SkString("linepath"); diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 88b2924a17..e83f3272d4 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -98,9 +98,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("lumafilter"); diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index 56bb0cdad3..5b1ede3049 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -19,9 +19,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } virtual SkString onShortName() { return SkString("matrixconvolution"); diff --git a/gm/mixedxfermodes.cpp b/gm/mixedxfermodes.cpp index 331d1ec0bd..f818719bcd 100644 --- a/gm/mixedxfermodes.cpp +++ b/gm/mixedxfermodes.cpp @@ -164,11 +164,6 @@ protected: canvas->restore(); } - virtual uint32_t onGetFlags() const { - // Skip PDF rasterization since rendering this PDF takes forever. - return kSkipPDFRasterization_Flag | kSkipTiled_Flag; - } - private: enum { kNumShapes = 100, diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 15b57e321d..97a5ffcdba 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -534,7 +534,6 @@ namespace skiagm { return name; } - uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } bool runAsBench() const SK_OVERRIDE { return true; } private: diff --git a/gm/nested.cpp b/gm/nested.cpp index 5c7b09ca0b..025bdce441 100644 --- a/gm/nested.cpp +++ b/gm/nested.cpp @@ -19,9 +19,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { SkString name("nested"); diff --git a/gm/nonclosedpaths.cpp b/gm/nonclosedpaths.cpp index 189daff79c..bf49ca0766 100644 --- a/gm/nonclosedpaths.cpp +++ b/gm/nonclosedpaths.cpp @@ -32,9 +32,6 @@ public: }; protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("nonclosedpaths"); diff --git a/gm/ovals.cpp b/gm/ovals.cpp index a4232aab37..7af996ee91 100755 --- a/gm/ovals.cpp +++ b/gm/ovals.cpp @@ -26,9 +26,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("ovals"); diff --git a/gm/patch.cpp b/gm/patch.cpp index 3a09ad8620..61a6cad221 100644 --- a/gm/patch.cpp +++ b/gm/patch.cpp @@ -84,10 +84,6 @@ protected: return SkISize::Make(800, 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; diff --git a/gm/patchgrid.cpp b/gm/patchgrid.cpp index aefa20b0e5..7c0ee9c9e0 100644 --- a/gm/patchgrid.cpp +++ b/gm/patchgrid.cpp @@ -72,10 +72,6 @@ protected: return SkISize::Make(800, 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp index b24bd90061..c51ac12c6a 100644 --- a/gm/patheffects.cpp +++ b/gm/patheffects.cpp @@ -107,9 +107,6 @@ public: PathEffectGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("patheffect"); diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp index b4e5a020e7..6b37c6693a 100644 --- a/gm/pathfill.cpp +++ b/gm/pathfill.cpp @@ -125,9 +125,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("pathfill"); @@ -163,9 +160,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("pathinvfill"); diff --git a/gm/pathreverse.cpp b/gm/pathreverse.cpp index dbd58e561c..f304467662 100644 --- a/gm/pathreverse.cpp +++ b/gm/pathreverse.cpp @@ -68,9 +68,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("path-reverse"); diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp index 24e509c42b..3a881ff8c5 100644 --- a/gm/peekpixels.cpp +++ b/gm/peekpixels.cpp @@ -64,12 +64,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { - // we explicitly test peekPixels and readPixels, neither of which - // return something for a picture-backed canvas, so we skip that test. - return kSkipPicture_Flag; - } - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index eae758d344..6f05853f77 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -101,15 +101,6 @@ protected: } } - // SkPictureImageFilter doesn't support serialization yet. - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipPicture_Flag | - kSkipPipe_Flag | - kSkipPipeCrossProcess_Flag | - kSkipTiled_Flag | - kSkipScaledReplay_Flag; - } - private: SkAutoTUnref<SkPicture> fPicture; typedef GM INHERITED; diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp index 461f7e9697..eccf6a6287 100644 --- a/gm/pictureshader.cpp +++ b/gm/pictureshader.cpp @@ -42,9 +42,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("pictureshader"); diff --git a/gm/pictureshadertile.cpp b/gm/pictureshadertile.cpp index e2acc9e9a8..46a4386720 100644 --- a/gm/pictureshadertile.cpp +++ b/gm/pictureshadertile.cpp @@ -82,9 +82,6 @@ static void draw_scene(SkCanvas* canvas, SkScalar pictureSize) { class PictureShaderTileGM : public skiagm::GM { protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("pictureshadertile"); diff --git a/gm/points.cpp b/gm/points.cpp index 58233ddd29..a634f3b29f 100644 --- a/gm/points.cpp +++ b/gm/points.cpp @@ -15,9 +15,6 @@ public: PointsGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("points"); diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp index 728650e210..823616e88f 100644 --- a/gm/poly2poly.cpp +++ b/gm/poly2poly.cpp @@ -179,9 +179,6 @@ public: Poly2PolyGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("poly2poly"); diff --git a/gm/polygons.cpp b/gm/polygons.cpp index e8d85040d2..1751eadfe9 100644 --- a/gm/polygons.cpp +++ b/gm/polygons.cpp @@ -22,9 +22,6 @@ public: PolygonsGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("polygons"); diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp index 6d4f5176d9..d9448b6baf 100644 --- a/gm/quadpaths.cpp +++ b/gm/quadpaths.cpp @@ -16,9 +16,6 @@ public: QuadPathGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("quadpath"); @@ -164,9 +161,6 @@ public: QuadClosePathGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("quadclosepath"); diff --git a/gm/rects.cpp b/gm/rects.cpp index e0b25ae571..686f03dae5 100644 --- a/gm/rects.cpp +++ b/gm/rects.cpp @@ -25,9 +25,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("rects"); diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp index 351421e37f..e87dff0d35 100644 --- a/gm/resizeimagefilter.cpp +++ b/gm/resizeimagefilter.cpp @@ -25,13 +25,6 @@ protected: return SkString("resizeimagefilter"); } -#ifdef SK_CPU_ARM64 - // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } -#endif - void draw(SkCanvas* canvas, const SkRect& rect, const SkSize& deviceSize, diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp index 8d81d16e61..b012e51ef5 100644 --- a/gm/roundrects.cpp +++ b/gm/roundrects.cpp @@ -27,9 +27,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("roundrects"); diff --git a/gm/rrect.cpp b/gm/rrect.cpp index 9bc1995dd3..f174c96177 100644 --- a/gm/rrect.cpp +++ b/gm/rrect.cpp @@ -126,9 +126,6 @@ public: RRectGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("rrect"); diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 26d9194655..046e5e624a 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -56,14 +56,6 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(kImageWidth, kImageHeight); } - uint32_t onGetFlags() const SK_OVERRIDE { - if (kEffect_Type == fType) { - return kGPUOnly_Flag | kSkipTiled_Flag; - } else { - return kSkipTiled_Flag; - } - } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { #if SK_SUPPORT_GPU GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp index 51dfde2d92..7f77463ee5 100644 --- a/gm/samplerstress.cpp +++ b/gm/samplerstress.cpp @@ -28,9 +28,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("gpusamplerstress"); diff --git a/gm/selftest.cpp b/gm/selftest.cpp index a332c5d15d..332a0cd275 100644 --- a/gm/selftest.cpp +++ b/gm/selftest.cpp @@ -16,8 +16,8 @@ class SelfTestGM : public skiagm::GM { public: - SelfTestGM(const char name[], SkColor color, uint32_t flags) : - fName(name), fColor(color), fFlags(flags) {} + SelfTestGM(const char name[], SkColor color) : + fName(name), fColor(color) {} const static int kWidth = 300; const static int kHeight = 200; @@ -35,12 +35,9 @@ protected: canvas->drawRectCoords(0, 0, SkIntToScalar(kWidth), SkIntToScalar(kHeight), paint); } - virtual uint32_t onGetFlags() const { return fFlags; } - private: const SkString fName; const SkColor fColor; - const uint32_t fFlags; }; ////////////////////////////////////////////////////////////////////////////// @@ -52,10 +49,10 @@ static SkColor kTranslucentGreen = 0x7700EE00; static SkColor kTranslucentBlue = 0x770000DD; static skiagm::GM* F1(void*) { - return new SelfTestGM("selftest1", kTranslucentGreen, 0); + return new SelfTestGM("selftest1", kTranslucentGreen); } static skiagm::GM* F2(void*) { - return new SelfTestGM("selftest2", kTranslucentBlue, skiagm::GM::kSkipPipe_Flag); + return new SelfTestGM("selftest2", kTranslucentBlue); } static skiagm::GMRegistry gR1(F1); diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp index e6fcc4ef4b..a7de479c1a 100644 --- a/gm/shaderbounds.cpp +++ b/gm/shaderbounds.cpp @@ -34,9 +34,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index f51aba288a..fa8e2b59ef 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -91,9 +91,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("shadertext"); diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index 23e42ad408..31d1e89869 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -199,11 +199,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { - // disable 565 for now, til mike fixes the debug assert - return kSkip565_Flag | kSkipTiled_Flag; - } - private: typedef GM INHERITED; }; diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index 77a9447f59..7b84f69e49 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -52,9 +52,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("shadertext3"); diff --git a/gm/shallowgradient.cpp b/gm/shallowgradient.cpp index 6cd2ed61f4..2b7dfbd9b6 100644 --- a/gm/shallowgradient.cpp +++ b/gm/shallowgradient.cpp @@ -42,12 +42,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - if (fName.contains("linear") || fName.contains("radial")) { - return kSkipTiled_Flag; - } - return 0; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/spritebitmap.cpp b/gm/spritebitmap.cpp index 4efff3cd5a..eeb4b73a82 100644 --- a/gm/spritebitmap.cpp +++ b/gm/spritebitmap.cpp @@ -62,9 +62,6 @@ public: SpriteBitmapGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("spritebitmap"); diff --git a/gm/stringart.cpp b/gm/stringart.cpp index 050d78f2d8..fe69626447 100644 --- a/gm/stringart.cpp +++ b/gm/stringart.cpp @@ -23,9 +23,6 @@ public: StringArtGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("stringart"); diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp index 836fedae7b..256c7a2148 100644 --- a/gm/strokefill.cpp +++ b/gm/strokefill.cpp @@ -19,9 +19,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("stroke-fill"); diff --git a/gm/strokerect.cpp b/gm/strokerect.cpp index 3fcb42c7de..da551e799c 100644 --- a/gm/strokerect.cpp +++ b/gm/strokerect.cpp @@ -46,9 +46,6 @@ public: StrokeRectGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("strokerect"); diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp index dea8e8c1c8..5609c5f6b3 100644 --- a/gm/strokerects.cpp +++ b/gm/strokerects.cpp @@ -25,9 +25,6 @@ public: StrokeRectsGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("strokerects"); diff --git a/gm/strokes.cpp b/gm/strokes.cpp index 1a6937e1bd..1039769e0b 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -39,9 +39,6 @@ public: StrokesGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("strokes_round"); @@ -95,9 +92,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("strokes_poly"); @@ -196,9 +190,6 @@ public: Strokes3GM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("strokes3"); diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp index 082ae54989..914462cbd2 100644 --- a/gm/stroketext.cpp +++ b/gm/stroketext.cpp @@ -71,9 +71,6 @@ public: StrokeTextGM() {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("stroketext"); diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp index db55dddb94..06b23352f4 100644 --- a/gm/tallstretchedbitmaps.cpp +++ b/gm/tallstretchedbitmaps.cpp @@ -91,11 +91,6 @@ protected: canvas->drawBitmapRect(bmp, &subRect, dstRect, &paint); canvas->translate(SkIntToScalar(bmp.width() + 10), 0); } - } - - uint32_t onGetFlags() const SK_OVERRIDE { - // This GM causes issues in replay modes. - return kSkipTiled_Flag | kNoBBH_Flag | kSkipPicture_Flag; } private: diff --git a/gm/techtalk1.cpp b/gm/techtalk1.cpp index c77f83cfd3..f52e48b829 100644 --- a/gm/techtalk1.cpp +++ b/gm/techtalk1.cpp @@ -359,10 +359,6 @@ protected: fProc(canvas, fShowGL, fFlags); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipPDF_Flag | kSkipPicture_Flag | kSkipPipe_Flag | kSkipTiled_Flag; - } - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/testimagefilters.cpp b/gm/testimagefilters.cpp index 82fa833de5..b85c0aa86c 100644 --- a/gm/testimagefilters.cpp +++ b/gm/testimagefilters.cpp @@ -101,10 +101,6 @@ protected: return SkString("testimagefilters"); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } void onDraw(SkCanvas* canvas) SK_OVERRIDE { diff --git a/gm/texdata.cpp b/gm/texdata.cpp index 99087b56ad..dafd579e1f 100644 --- a/gm/texdata.cpp +++ b/gm/texdata.cpp @@ -35,8 +35,6 @@ protected: return SkISize::Make(2*S, 2*S); } - uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* target = canvas->internal_private_accessTopLayerRenderTarget(); GrContext* ctx = canvas->getGrContext(); diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp index bf851f6c7f..0738d82662 100644 --- a/gm/textblobshader.cpp +++ b/gm/textblobshader.cpp @@ -73,10 +73,6 @@ protected: SkShader::kRepeat_TileMode)); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkip565_Flag; - } - SkString onShortName() SK_OVERRIDE { return SkString("textblobshader"); } diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 7b74cec7b5..570ec254f3 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -41,11 +41,6 @@ protected: return SkISize::Make(SkScalarCeilToInt(canvasWidth), 800); } - uint32_t onGetFlags() const SK_OVERRIDE { - // This is a GPU-specific GM. - return kGPUOnly_Flag; - } - void onOnceBeforeDraw() SK_OVERRIDE { fBmp.allocN32Pixels(kTargetWidth, kTargetHeight); SkCanvas canvas(fBmp); diff --git a/gm/tiledscaledbitmap.cpp b/gm/tiledscaledbitmap.cpp index bc6c61f452..6b47315b11 100644 --- a/gm/tiledscaledbitmap.cpp +++ b/gm/tiledscaledbitmap.cpp @@ -39,10 +39,6 @@ protected: return SkISize::Make(1016, 616); } - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } - static SkBitmap make_bm(int width, int height) { SkBitmap bm; bm.allocN32Pixels(width, height); diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp index ad8aa12f4d..8dc54a977b 100644 --- a/gm/tilemodes.cpp +++ b/gm/tilemodes.cpp @@ -194,9 +194,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp index 4edd11586f..508e57678a 100644 --- a/gm/tilemodes_scaled.cpp +++ b/gm/tilemodes_scaled.cpp @@ -73,13 +73,6 @@ protected: return name; } -#ifdef SK_CPU_ARM64 - // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } -#endif - SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); } void onOnceBeforeDraw() SK_OVERRIDE { @@ -213,9 +206,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return fName; diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index dba5d70eb6..bbdbc8a6d2 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -136,11 +136,6 @@ protected: } } - uint32_t onGetFlags() const SK_OVERRIDE { - // The aa hairline stroked rects used to visualize the clip draw slightly differently in - // quilt mode in dm. - return kSkipTiled_Flag; - } bool runAsBench() const SK_OVERRIDE { return true; } private: diff --git a/gm/vertices.cpp b/gm/vertices.cpp index bfeb8f5e3c..5d156339d0 100644 --- a/gm/vertices.cpp +++ b/gm/vertices.cpp @@ -38,9 +38,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } void onOnceBeforeDraw() SK_OVERRIDE { const SkScalar X = 150; diff --git a/gm/verttext.cpp b/gm/verttext.cpp index 18211e9b8c..ba355a589e 100644 --- a/gm/verttext.cpp +++ b/gm/verttext.cpp @@ -49,9 +49,6 @@ public: //SkAutoTUnref<SkTypeface> fFace; protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { return SkString("verttext"); diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp index 9eba68b164..6cb5235aff 100644 --- a/gm/verttext2.cpp +++ b/gm/verttext2.cpp @@ -31,9 +31,6 @@ public: } protected: - uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; - } SkString onShortName() SK_OVERRIDE { diff --git a/gm/verylargebitmap.cpp b/gm/verylargebitmap.cpp index 00d1b71c3d..1cfecd8ad7 100644 --- a/gm/verylargebitmap.cpp +++ b/gm/verylargebitmap.cpp @@ -99,18 +99,6 @@ protected: show_bm(canvas, veryBig, small, colors); } -#ifdef SK_BUILD_FOR_WIN32 - virtual uint32_t onGetFlags() const { - // The Windows bot runs out of memory in replay modes on this test in 32bit builds: - // http://skbug.com/1756 - return kSkipPicture_Flag | - kSkipPipe_Flag | - kSkipPipeCrossProcess_Flag | - kSkipTiled_Flag | - kSkipScaledReplay_Flag; - } -#endif - private: typedef skiagm::GM INHERITED; }; diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 21d42cbd14..1a2c9c9f39 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -38,11 +38,6 @@ protected: return SkISize::Make(334, 128); } - uint32_t onGetFlags() const SK_OVERRIDE { - // This is a GPU-specific GM. - return kGPUOnly_Flag; - } - void onOnceBeforeDraw() SK_OVERRIDE { SkImageInfo info = SkImageInfo::MakeA8(24, 24); fBmp[0].allocPixels(info); |