Skip tiled drawing in GM for magnifier image filter.

Merely skips the test until we get a real fix for the problem.

BUG=https://code.google.com/p/skia/issues/detail?id=781

Review URL: https://codereview.appspot.com/6459094

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

3 files changed, 11 insertions, 5 deletions

diff --git a/gm/gm.h b/gm/gm.h
index 4072f10295..399c3fea9f 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -32,7 +32,8 @@ namespace skiagm {
         enum Flags {
             kSkipPDF_Flag       = 1 << 0,
             kSkipPicture_Flag   = 1 << 1,
-            kSkipPipe_Flag      = 1 << 2
+            kSkipPipe_Flag      = 1 << 2,
+            kSkipTiled_Flag     = 1 << 3,
         };
 
         void draw(SkCanvas*);
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index c944378cdb..07e57a48ba 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1108,7 +1108,7 @@ int main(int argc, char * const argv[]) {
             }
 
             if ((ERROR_NONE == testErrors) && doTiledPipe &&
-                !(gmFlags & GM::kSkipPipe_Flag)) {
+                !SkToBool(gmFlags & (GM::kSkipPipe_Flag | GM::kSkipTiled_Flag))) {
                 testErrors |= test_tiled_pipe_playback(gm, config,
                                                  forwardRenderedBitmap,
                                                  readPath, diffPath);
diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp
index f9aff281fe..0966121d0d 100644
--- a/gm/imagemagnifier.cpp
+++ b/gm/imagemagnifier.cpp
@@ -20,15 +20,20 @@ public:
     }
 
 protected:
-    virtual SkString onShortName() {
+    virtual 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;
+    }
+
+    virtual SkString onShortName() SK_OVERRIDE {
         return SkString("imagemagnifier");
     }
 
-    virtual SkISize onISize() {
+    virtual SkISize onISize() SK_OVERRIDE {
         return make_isize(WIDTH, HEIGHT);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setImageFilter(
             new SkMagnifierImageFilter(