DM: don't run rtree when kSkipTiled is set.

dm/DMReplayTask.cpp

 #include "DMReplayTask.h"
 #include "DMWriteTask.h"
 #include "DMUtil.h"
 
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 
 DEFINE_bool(replay, true, "If true, run picture replay tests.");
 DEFINE_bool(rtree,  true, "If true, run picture replay tests with an rtree.");
 
@@ skipping 23 matching lines @@
         this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
     }
 }
 
 bool ReplayTask::shouldSkip() const {
     if (fGM->getFlags() & skiagm::GM::kSkipPicture_Flag) {
         return true;
     }
 
     if (FLAGS_rtree && fUseRTree) {
-        return fGM->getFlags() & skiagm::GM::kSkipTiled_Flag;
+        return (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag) != 0;

[scroggo, 2014/02/21 19:21:28]

You don't like SkToBool?

[mtklein, 2014/02/21 19:28:14]

Seemed clearer to test != 0 explicitly since we're doing bit logic.  SkToBool
makes me think we're dealing with the world of booleans and short circuiting
logic, when we're really dealing with the slightly-different world of bits.

I'd even happier to write return SkIsBitSet(fGM->getFlags(),
skiagm::GM::kSkipTiled_Flag);, but for now I just wanted things to build.

[scroggo, 2014/02/21 19:29:18]

sgtm

     }
     if (FLAGS_replay && !fUseRTree) {
         return false;
     }
     return true;
 }
 
 }  // namespace DM