Turn on quilt mode in DM.

- Rename TileGrid -> Quilt to avoid the name overload.
  - Tag all failing GMs with kSkipTiled_Flag.

You may be wondering, do any GMs pass?  Yes, some do!  And that trends towards all of them as we increase --quiltTile.

Two GMs only fail in --quilt mode in 565.  Otherwise all GMs which fail are skipped, and those which don't fail aren't. (The 8888 variants of those two GMs are skipped even though they pass.)

BUG=skia:2477
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/256373002

git-svn-id: http://skia.googlecode.com/svn/trunk@14457 2bbb7eff-a529-9590-31e7-b0007b416f81

dm/DMCpuGMTask.cpp

@@ -1,10 +1,10 @@
 #include "DMCpuGMTask.h"
 #include "DMExpectationsTask.h"
 #include "DMPipeTask.h"
+#include "DMQuiltTask.h"
 #include "DMRecordTask.h"
 #include "DMReplayTask.h"
 #include "DMSerializeTask.h"
-#include "DMTileGridTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 
@@ -39,11 +39,11 @@ void CpuGMTask::draw() {
     SPAWN(PipeTask, fGMFactory(NULL), bitmap, false, false);
     SPAWN(PipeTask, fGMFactory(NULL), bitmap, true, false);
     SPAWN(PipeTask, fGMFactory(NULL), bitmap, true, true);
+    SPAWN(QuiltTask, fGMFactory(NULL), bitmap);
     SPAWN(RecordTask, fGMFactory(NULL), bitmap);
     SPAWN(ReplayTask, fGMFactory(NULL), bitmap, false);
     SPAWN(ReplayTask, fGMFactory(NULL), bitmap, true);
     SPAWN(SerializeTask, fGMFactory(NULL), bitmap);
-    SPAWN(TileGridTask, fGMFactory(NULL), bitmap, SkISize::Make(16,16));
 
     SPAWN(WriteTask, bitmap);
 #undef SPAWN

dm/DMQuiltTask.cpp

@@ -1,51 +1,38 @@
-#include "DMTileGridTask.h"
-#include "DMWriteTask.h"
+#include "DMQuiltTask.h"
 #include "DMUtil.h"
+#include "DMWriteTask.h"
 
-#include "SkBBHFactory.h"
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 
-// TODO(mtklein): Tile grid tests are currently failing.  (Skia issue 1198).  When fixed, -> true.
-DEFINE_bool(tileGrid, false, "If true, run picture replay tests with a tile grid.");
+DEFINE_bool(quilt, true, "If true, draw into a quilt of small tiles and compare.");
+DEFINE_int32(quiltTile, 16, "Dimension of (square) quilt tile.");
 
 namespace DM {
 
-TileGridTask::TileGridTask(const Task& parent, skiagm::GM* gm, SkBitmap reference, SkISize tileSize)
+QuiltTask::QuiltTask(const Task& parent, skiagm::GM* gm, SkBitmap reference)
     : CpuTask(parent)
-    , fName(UnderJoin(parent.name().c_str(), "tilegrid"))
+    , fName(UnderJoin(parent.name().c_str(), "quilt"))
     , fGM(gm)
     , fReference(reference)
-    , fTileSize(tileSize)
     {}
 
 static int tiles_needed(int fullDimension, int tileDimension) {
     return (fullDimension + tileDimension - 1) / tileDimension;
 }
 
-void TileGridTask::draw() {
-    const SkTileGridFactory::TileGridInfo info = {
-        fTileSize,
-        SkISize::Make(0,0),    // Overlap between adjacent tiles.
-        SkIPoint::Make(0,0),   // Offset.
-    };
-    SkTileGridFactory factory(info);
-    SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get(),
-                                                   SkPicture::kUsePathBoundsForClip_RecordingFlag,
-                                                   &factory));
+void QuiltTask::draw() {
+    SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get()));
 
     SkBitmap full;
     SetupBitmap(fReference.colorType(), fGM.get(), &full);
     SkCanvas fullCanvas(full);
 
     SkBitmap tile;
-    tile.allocPixels(SkImageInfo::Make(fTileSize.width(), fTileSize.height(),
+    tile.allocPixels(SkImageInfo::Make(FLAGS_quiltTile, FLAGS_quiltTile,
                                        fReference.colorType(), kPremul_SkAlphaType));
     SkCanvas tileCanvas(tile);
 
-    SkPaint paint;
-    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-
     for (int y = 0; y < tiles_needed(full.height(), tile.height()); y++) {
         for (int x = 0; x < tiles_needed(full.width(), tile.width()); x++) {
             SkAutoCanvasRestore ar(&tileCanvas, true/*also save now*/);
@@ -58,7 +45,7 @@ void TileGridTask::draw() {
 
             recorded->draw(&tileCanvas);
             tileCanvas.flush();
-            fullCanvas.drawBitmap(tile, xOffset, yOffset, &paint);
+            fullCanvas.drawBitmap(tile, xOffset, yOffset, NULL);
         }
     }
 
@@ -68,14 +55,14 @@ void TileGridTask::draw() {
     }
 }
 
-bool TileGridTask::shouldSkip() const {
+bool QuiltTask::shouldSkip() const {
     if (fGM->getFlags() & skiagm::GM::kSkipPicture_Flag) {
         return true;
     }
     if (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag) {
         return true;
     }
-    return !FLAGS_tileGrid;
+    return !FLAGS_quilt;
 }
 
 }  // namespace DM

dm/DMQuiltTask.h

@@ -1,5 +1,5 @@
-#ifndef DMTileGridTask_DEFINED
-#define DMTileGridTask_DEFINED
+#ifndef DMQuiltTask_DEFINED
+#define DMQuiltTask_DEFINED
 
 #include "DMTask.h"
 #include "SkBitmap.h"
@@ -11,13 +11,12 @@
 
 namespace DM {
 
-class TileGridTask : public CpuTask {
+class QuiltTask : public CpuTask {
 
 public:
-    TileGridTask(const Task& parent,  // TileGridTask must be a child task.  Pass its parent here.
-                 skiagm::GM*,         // GM to run through a picture.  Takes ownership.
-                 SkBitmap reference,  // Bitmap to compare picture replay results to.
-                 SkISize tileSize);   // Tile size to use.
+    QuiltTask(const Task& parent,   // QuiltTask must be a child task.  Pass its parent here.
+                skiagm::GM*,          // GM to run through a picture.  Takes ownership.
+                SkBitmap reference);  // Bitmap to compare picture replay results to.
 
     virtual void draw() SK_OVERRIDE;
     virtual bool shouldSkip() const SK_OVERRIDE;
@@ -27,7 +26,6 @@ private:
     const SkString fName;
     SkAutoTDelete<skiagm::GM> fGM;
     const SkBitmap fReference;
-    const SkISize fTileSize;
 };
 
 }  // namespace DM

gm/aarectmodes.cpp

@@ -133,6 +133,9 @@ namespace skiagm {
         }
 
     protected:
+        virtual uint32_t onGetFlags() const SK_OVERRIDE {
+            return kSkipTiled_Flag;
+        }
 
         virtual SkString onShortName() {
             return SkString("aarectmodes");

gm/alphagradients.cpp

@@ -73,7 +73,7 @@ protected:
         }
     }
 
-    virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
+    virtual uint32_t onGetFlags() const { return kSkipPipe_Flag | kSkipTiled_Flag; }
 
 private:
     typedef skiagm::GM INHERITED;

gm/arcofzorro.cpp

@@ -20,6 +20,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("arcofzorro");
     }

gm/bicubicfilter.cpp

@@ -18,6 +18,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("bicubicfilter");
     }

gm/bigmatrix.cpp

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

gm/bigtext.cpp

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

gm/bitmapmatrix.cpp

@@ -24,6 +24,10 @@ public:
     DrawBitmapMatrixGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("drawbitmapmatrix");
     }

gm/bitmaprecttest.cpp

@@ -56,6 +56,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("bitmaprecttest");
     }

gm/bitmapscroll.cpp

@@ -59,6 +59,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("bitmapscroll");
     }

gm/bitmapshader.cpp

@@ -50,6 +50,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("bitmapshaders");
     }

gm/bleed.cpp

@@ -85,6 +85,10 @@ public:
     BleedGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("bleed");
     }

gm/blurrect.cpp

@@ -115,7 +115,7 @@ protected:
         }
     }
 
-    virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
+    virtual uint32_t onGetFlags() const { return kSkipPipe_Flag | kSkipTiled_Flag; }
 
 private:
     void drawProcs(SkCanvas* canvas, const SkRect& r, const SkPaint& paint,

gm/blurroundrect.cpp

@@ -43,6 +43,10 @@ public:
         fRRect.setRectRadii(r, radii);
     }
 
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }
@@ -101,6 +105,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }

gm/blurs.cpp

@@ -18,6 +18,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("blurs");
     }

gm/circles.cpp

@@ -25,6 +25,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("circles");
     }

gm/circularclips.cpp

@@ -16,6 +16,10 @@ public:
     CircularClipsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("circular-clips");
     }

gm/coloremoji.cpp

@@ -22,6 +22,10 @@ public:
         SkSafeUnref(fTypeface);
     }
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
 
         SkString filename(INHERITED::gResourcePath);

gm/colorfilters.cpp

@@ -49,6 +49,10 @@ protected:
         return SkISize::Make(640, 480);
     }
 
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         SkRect r;

gm/complexclip.cpp

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

gm/complexclip2.cpp

@@ -111,6 +111,13 @@ protected:
         return "";
     }
 
+    virtual 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/composeshader.cpp

@@ -51,6 +51,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("composeshader");
     }

gm/convexpaths.cpp

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

gm/convexpolyclip.cpp

@@ -213,7 +213,7 @@ protected:
     }
 
     virtual uint32_t onGetFlags() const {
-        return kAsBench_Flag;
+        return kAsBench_Flag | kSkipTiled_Flag;
     }
 
 private:

gm/cubicpaths.cpp

@@ -16,6 +16,10 @@ public:
     ClippedCubicGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("clippedcubic");
     }
@@ -55,6 +59,10 @@ public:
     CubicPathGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("cubicpath");
     }
@@ -198,6 +206,10 @@ public:
     CubicClosePathGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("cubicclosepath");
     }

gm/dashcubics.cpp

@@ -20,6 +20,10 @@ public:
     DashCubicsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("dashcubics");
     }

gm/dashing.cpp

@@ -37,6 +37,10 @@ public:
     DashingGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("dashing");
     }
@@ -119,6 +123,10 @@ public:
     Dashing2GM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("dashing2");
     }
@@ -177,6 +185,10 @@ public:
     Dashing3GM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("dashing3");
     }

gm/degeneratesegments.cpp

@@ -22,6 +22,10 @@ protected:
         const char* fName2;
     };
 
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("degeneratesegments");
     }

gm/downsamplebitmap.cpp

@@ -40,6 +40,13 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        if (SkPaint::kHigh_FilterLevel != fFilterLevel) {
+            return kSkipTiled_Flag;
+        }
+        return 0;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }

gm/drawlooper.cpp

@@ -27,6 +27,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkISize onISize() {
         return SkISize::Make(520, 160);
     }

gm/dropshadowimagefilter.cpp

@@ -115,7 +115,7 @@ protected:
         // 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;
+        return kSkipScaledReplay_Flag | kSkipTiled_Flag;
     }
 
     virtual void onDraw(SkCanvas* canvas) {

gm/drrect.cpp

@@ -15,6 +15,10 @@ public:
     DRRectGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("drrect");
     }

gm/fatpathfill.cpp

@@ -56,6 +56,10 @@ public:
     FatPathFillGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("fatpathfill");
     }

gm/filltypes.cpp

@@ -25,6 +25,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("filltypes");
     }

gm/filltypespersp.cpp

@@ -24,6 +24,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("filltypespersp");
     }

gm/filterbitmap.cpp

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

gm/fontscaler.cpp

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

gm/getpostextpath.cpp

@@ -16,6 +16,10 @@ public:
     GetPosTextPathGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("getpostextpath");
     }

gm/giantbitmap.cpp

@@ -71,6 +71,13 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        if (fDoFilter && fDoRotate && fMode != SkShader::kClamp_TileMode) {
+            return kSkipTiled_Flag;
+        }
+        return 0;
+    }
+
     virtual SkString onShortName() {
         SkString str("giantbitmap_");
         switch (fMode) {

gm/gradientDirtyLaundry.cpp

@@ -75,6 +75,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() SK_OVERRIDE { return SkString("gradient_dirty_laundry"); }
     virtual SkISize onISize() SK_OVERRIDE { return make_isize(640, 615); }
 

gm/gradient_matrix.cpp

@@ -120,6 +120,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() SK_OVERRIDE {
         return SkString("gradient_matrix");
     }

gm/gradients.cpp

@@ -112,6 +112,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("gradients");
     }
@@ -165,6 +169,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("gradients_local_perspective");
     }
@@ -294,6 +302,10 @@ public:
     ClampedGradientsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() { return SkString("clamped_gradients"); }
 
     virtual SkISize onISize() { return SkISize::Make(640, 510); }
@@ -333,6 +345,10 @@ public:
     RadialGradientGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() { return SkString("radial_gradient"); }
     virtual SkISize onISize() { return SkISize::Make(1280, 1280); }
     void drawBG(SkCanvas* canvas) {
@@ -372,6 +388,10 @@ public:
     RadialGradient2GM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() { return SkString("radial_gradient2"); }
     virtual SkISize onISize() { return SkISize::Make(800, 400); }
     void drawBG(SkCanvas* canvas) {

gm/gradients_2pt_conical.cpp

@@ -339,6 +339,13 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        if (fGradCaseType != kInside_GradCaseType) {
+            return kSkipTiled_Flag;
+        }
+        return 0;
+    }
+
     SkString onShortName() {
         return fName;
     }

gm/gradients_no_texture.cpp

@@ -92,6 +92,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() SK_OVERRIDE { return SkString("gradients_no_texture"); }
     virtual SkISize onISize() SK_OVERRIDE { return make_isize(640, 615); }
 
@@ -214,6 +218,10 @@ public:
     GradientsManyColorsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); }
     virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); }
 

gm/gradtext.cpp

@@ -100,6 +100,10 @@ public:
     GradTextGM () {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
 
     virtual SkString onShortName() {
         return SkString("gradtext");

gm/hairlines.cpp

@@ -13,6 +13,10 @@ namespace skiagm {
 
 class HairlinesGM : public GM {
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
 
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("hairlines");

gm/hairmodes.cpp

@@ -78,7 +78,6 @@ namespace skiagm {
         SkPaint fBGPaint;
 
     protected:
-
         virtual SkString onShortName() SK_OVERRIDE {
             return SkString("hairmodes");
         }
@@ -123,7 +122,7 @@ namespace skiagm {
         }
 
         // disable pdf for now, since it crashes on mac
-        virtual uint32_t onGetFlags() const { return kSkipPDF_Flag; }
+        virtual uint32_t onGetFlags() const { return kSkipPDF_Flag | kSkipTiled_Flag; }
 
     private:
         typedef GM INHERITED;

gm/hittestpath.cpp

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

gm/imageblur.cpp

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

gm/imagefiltersbase.cpp

@@ -161,7 +161,6 @@ public:
     ImageFiltersBaseGM () {}
 
 protected:
-
     virtual SkString onShortName() {
         return SkString("imagefiltersbase");
     }
@@ -180,7 +179,7 @@ protected:
         // 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;
+        return kSkipScaledReplay_Flag | kSkipTiled_Flag;
     }
 
     virtual void onDraw(SkCanvas* canvas) {

gm/imagefiltersclipped.cpp

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

gm/imagefilterscropped.cpp

@@ -102,7 +102,6 @@ public:
     ImageFiltersCroppedGM () {}
 
 protected:
-
     virtual SkString onShortName() {
         return SkString("imagefilterscropped");
     }
@@ -121,7 +120,7 @@ protected:
         // 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;
+        return kSkipScaledReplay_Flag | kSkipTiled_Flag;
     }
 
     virtual void onDraw(SkCanvas* canvas) {

gm/imagefiltersgraph.cpp

@@ -90,6 +90,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("imagefiltersgraph");
     }

gm/imagefiltersscaled.cpp

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

gm/imageresizetiled.cpp

@@ -30,10 +30,6 @@ protected:
         return make_isize(WIDTH, HEIGHT);
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag;
-    }
-
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         SkMatrix matrix;

gm/inversepaths.cpp

@@ -70,6 +70,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("inverse_paths");
     }

gm/lerpmode.cpp

@@ -39,6 +39,10 @@ public:
     LerpXfermodeGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("lerpmode");
     }

gm/lighting.cpp

@@ -20,6 +20,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("lighting");
     }

gm/linepaths.cpp

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

gm/lumafilter.cpp

@@ -97,6 +97,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("lumafilter");
     }

gm/matrixconvolution.cpp

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

gm/mixedxfermodes.cpp

@@ -124,7 +124,7 @@ protected:
 
     virtual uint32_t onGetFlags() const {
         // Skip PDF rasterization since rendering this PDF takes forever.
-        return kSkipPDFRasterization_Flag;
+        return kSkipPDFRasterization_Flag | kSkipTiled_Flag;
     }
 
 private:

gm/nested.cpp

@@ -19,6 +19,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         SkString name("nested");
         if (fDoAA) {

gm/ninepatchstretch.cpp

@@ -44,6 +44,10 @@ public:
     NinePatchStretchGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("ninepatch-stretch");
     }

gm/nonclosedpaths.cpp

@@ -32,6 +32,10 @@ public:
     };
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("nonclosedpaths");
     }

gm/ovals.cpp

@@ -26,6 +26,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("ovals");
     }

gm/patheffects.cpp

@@ -107,6 +107,10 @@ public:
     PathEffectGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("patheffect");
     }

gm/pathfill.cpp

@@ -125,6 +125,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("pathfill");
     }
@@ -159,6 +163,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("pathinvfill");
     }

gm/pathinterior.cpp

@@ -25,6 +25,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkISize onISize() {
         return SkISize::Make(770, 770);
     }

gm/pathopsinverse.cpp

@@ -50,6 +50,10 @@ protected:
         paint->setColor(color);
     }
 
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;  // Only for 565.  8888 is fine.
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("pathopsinverse");
     }

gm/pathopsskpclip.cpp

@@ -24,6 +24,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("pathopsskpclip");
     }

gm/pathreverse.cpp

@@ -69,6 +69,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("path-reverse");
     }

gm/pictureshader.cpp

@@ -58,6 +58,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("pictureshader");
     }

gm/points.cpp

@@ -15,6 +15,10 @@ public:
     PointsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("points");
     }

gm/poly2poly.cpp

@@ -178,6 +178,10 @@ public:
     Poly2PolyGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("poly2poly");
     }

gm/polygons.cpp

@@ -22,6 +22,10 @@ public:
     PolygonsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("polygons");
     }

gm/quadpaths.cpp

@@ -16,6 +16,10 @@ public:
     QuadPathGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("quadpath");
     }
@@ -158,6 +162,10 @@ public:
     QuadClosePathGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     SkString onShortName() {
         return SkString("quadclosepath");
     }

gm/rects.cpp

@@ -25,6 +25,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("rects");
     }

gm/resizeimagefilter.cpp

@@ -21,6 +21,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("resizeimagefilter");
     }

gm/roundrects.cpp

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

gm/rrect.cpp

@@ -126,6 +126,10 @@ public:
     RRectGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("rrect");
     }

gm/rrects.cpp

@@ -58,9 +58,9 @@ protected:
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         if (kEffect_Type == fType) {
-            return kGPUOnly_Flag;
+            return kGPUOnly_Flag | kSkipTiled_Flag;
         } else {
-            return 0;
+            return kSkipTiled_Flag;
         }
     }
 

gm/samplerstress.cpp

@@ -28,6 +28,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("samplerstress");
     }

gm/shaderbounds.cpp

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

gm/shadertext.cpp

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

gm/shadertext2.cpp

@@ -205,7 +205,7 @@ protected:
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         // disable 565 for now, til mike fixes the debug assert
-        return this->INHERITED::onGetFlags() | kSkip565_Flag;
+        return kSkip565_Flag | kSkipTiled_Flag;
     }
 
 private:

gm/shadertext3.cpp

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

gm/shadows.cpp

@@ -36,6 +36,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("shadows");
     }

gm/shallowgradient.cpp

@@ -42,6 +42,13 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        if (fName.contains("linear") || fName.contains("radial")) {
+            return kSkipTiled_Flag;
+        }
+        return 0;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return fName;
     }

gm/simpleaaclip.cpp

@@ -124,6 +124,10 @@ protected:
         canvas->restore();
     }
 
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kPath_GeomType == fGeomType ? kSkipTiled_Flag : 0;
+    }
+
     virtual SkString onShortName() {
         SkString str;
         str.printf("simpleaaclip_%s",

gm/skbug1719.cpp

@@ -24,6 +24,10 @@ public:
     SkBug1719GM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("skbug1719");
     }

gm/spritebitmap.cpp

@@ -62,6 +62,10 @@ public:
     SpriteBitmapGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("spritebitmap");
     }

gm/stringart.cpp

@@ -23,6 +23,10 @@ public:
     StringArtGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("stringart");
     }

gm/strokefill.cpp

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

gm/strokerect.cpp

@@ -46,6 +46,10 @@ public:
     StrokeRectGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("strokerect");
     }

gm/strokerects.cpp

@@ -25,6 +25,10 @@ public:
     StrokeRectsGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("strokerects");
     }

gm/strokes.cpp

@@ -39,6 +39,10 @@ public:
     StrokesGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("strokes_round");
     }
@@ -91,6 +95,10 @@ public:
     }
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("strokes_poly");
     }
@@ -188,6 +196,10 @@ public:
     Strokes3GM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() {
         return SkString("strokes3");
     }

gm/stroketext.cpp

@@ -50,6 +50,10 @@ public:
     StrokeTextGM() {}
 
 protected:
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("stroketext");
     }