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

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

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

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");

gm/alphagradients.cpp

@@ -72,8 +72,6 @@ protected:
         }
     }
 
-    uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; }
-
 private:
     typedef skiagm::GM INHERITED;
 };

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");

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();

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");

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");

gm/bitmapcopy.cpp

@@ -114,9 +114,6 @@ protected:
         }
     }
 
-    virtual uint32_t onGetFlags() const { return kSkipPicture_Flag
-                                               | kSkipPipe_Flag; }
-
 private:
     typedef GM INHERITED;
 };

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

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

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");

gm/blurcircles.cpp

@@ -19,9 +19,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() SK_OVERRIDE {
         return fName;

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

gm/blurroundrect.cpp

@@ -126,9 +126,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() SK_OVERRIDE {
         return fName;

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");

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");

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

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

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;

gm/colortype.cpp

@@ -60,10 +60,6 @@ protected:
         }
     }
 
-    virtual uint32_t onGetFlags() const {
-        return kSkipPipe_Flag | kSkipPicture_Flag;
-    }
-
 private:
     SkTypeface* fColorType;
 

gm/colortypexfermode.cpp

@@ -156,10 +156,6 @@ protected:
         s->unref();
     }
 
-    virtual uint32_t onGetFlags() const {
-        return kSkipPipe_Flag | kSkipPicture_Flag;
-    }
-
 private:
     SkTypeface* fColorType;
 

gm/complexclip.cpp

@@ -27,9 +27,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
 
     SkString onShortName() {

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");

gm/complexclip3.cpp

@@ -21,9 +21,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() {
         SkString str;

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;

gm/convexpaths.cpp

@@ -34,9 +34,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     virtual SkString onShortName() {
         return SkString("convexpaths");

gm/convexpolyclip.cpp

@@ -214,10 +214,6 @@ protected:
         }
     }
 
-    virtual uint32_t onGetFlags() const {
-        return kSkipTiled_Flag;
-    }
-
     bool runAsBench() const SK_OVERRIDE { return true; }
 
 private:

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

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");

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");

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

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");

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

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

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");

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

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

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");

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;
 

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");

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");

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");

gm/filterbitmap.cpp

@@ -70,9 +70,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() SK_OVERRIDE {
         return fName;

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{

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

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;

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;

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");

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");

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_");

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");

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");

gm/gm.h

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

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");

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

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

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

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 {

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

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");

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

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");

gm/imageblur.cpp

@@ -23,9 +23,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() SK_OVERRIDE {
         return fName;

gm/imageblur2.cpp

@@ -36,9 +36,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() SK_OVERRIDE {
         return fName;

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,

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");

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

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");

gm/imagefiltersscaled.cpp

@@ -31,9 +31,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     virtual SkString onShortName() {
         return SkString("imagefiltersscaled");

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");

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");

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");

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;

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");

gm/linepaths.cpp

@@ -16,9 +16,6 @@ public:
     LinePathGM() {}
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     SkString onShortName() {
         return SkString("linepath");

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");

gm/matrixconvolution.cpp

@@ -19,9 +19,6 @@ public:
     }
 
 protected:
-    uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
 
     virtual SkString onShortName() {
         return SkString("matrixconvolution");

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,

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:

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");

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");

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");

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;

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;

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");

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");

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");

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

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;

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");

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");

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");

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");

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");

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");

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");

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,

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");

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");