Re-enable imageresizetiled, but skip it in tilegrid and rtree.

This change makes kSkipTiled_Flag also skip --tileGrid and --rtree.
All GMs which were passing kSkipTiled_Flag before were also passing
kSkipPicture_Flag, which also skips tilegrid and rtree, so this should
have no effect on them, but provides a smaller hammer for GMs which
still want to test picture playback, but not tiling.

The exception is magnifier, which was passing only kSkipTiled_Flag,
but magnifier is an odd beast and not web-exposed, so I'm not worried
about reducing its coverage slightly.

R=scroggo@google.com
BUG=skia:

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

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

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index d6457abb58eedb81a10544e4dcae34290768e713..c52c5d843b784a8319563d74998457a1bb4f5717 100644 (file)
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1610,7 +1610,8 @@ ErrorCombination run_multiple_modes(GMMain &gmmain, GM *gm, const ConfigData &co
 
     if (FLAGS_rtree) {
         const char renderModeDescriptor[] = "-rtree";
-        if (gmFlags & GM::kSkipPicture_Flag) {
+        if ((gmFlags & GM::kSkipPicture_Flag) ||
+            (gmFlags & GM::kSkipTiled_Flag)) {
             gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortNamePlusConfig,
                                      renderModeDescriptor);
             errorsForAllModes.add(kIntentionallySkipped_ErrorType);
@@ -1636,6 +1637,7 @@ ErrorCombination run_multiple_modes(GMMain &gmmain, GM *gm, const ConfigData &co
             }
 
             if ((gmFlags & GM::kSkipPicture_Flag) ||
+                (gmFlags & GM::kSkipTiled_Flag) ||
                 ((gmFlags & GM::kSkipScaledReplay_Flag) && replayScale != 1)) {
                 gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortNamePlusConfig,
                                          renderModeDescriptor.c_str());

diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp
index a54c811cca05321c81df646a4220cc5ad16311a6..ba154d14f4314ac541008008783341908321505c 100644 (file)
--- a/gm/imageresizetiled.cpp
+++ b/gm/imageresizetiled.cpp
@@ -30,6 +30,10 @@ 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;
         SkAutoTUnref<SkImageFilter> imageFilter(

diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 83e50afb53d54e55141c6f7b7232a5c6bd673ea2..8a9d36b5e4ede26d364e21de540b265772c86e80 100644 (file)
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -91,8 +91,7 @@
     '../gm/imageblur.cpp',
     '../gm/imageblurtiled.cpp',
     '../gm/imagemagnifier.cpp',
-    # This GM seems to have some issues with rtree and tilegrid; disabled for now.
-    #'../gm/imageresizetiled.cpp',
+    '../gm/imageresizetiled.cpp',
     '../gm/inversepaths.cpp',
     '../gm/lerpmode.cpp',
     '../gm/lighting.cpp',