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

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

Follow up to http://crrev.com/165723009, which changed this in GM.

Tested: out/Debug/dm

BUG=skia:

Committed: http://code.google.com/p/skia/source/detail?r=13537

NOTREECHECKS=True
NOTRY=True

Committed: http://code.google.com/p/skia/source/detail?r=13540

[scroggo, 2014-02-21 16:16:32]

lgtm

[mtklein, 2014-02-21 16:26:41]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-02-21 16:26:47]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/175283002/1

[commit-bot: I haz the power, 2014-02-21 18:23:38]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/175283002/1

[commit-bot: I haz the power, 2014-02-21 18:23:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-21 18:23:40]

Failed to apply patch for dm/DMReplayTask.cpp:
While running git apply --index -p1;
  Created missing directory dm.
  error: dm/DMReplayTask.cpp: does not exist in index

Patch:       dm/DMReplayTask.cpp
Index: dm/DMReplayTask.cpp
diff --git a/dm/DMReplayTask.cpp b/dm/DMReplayTask.cpp
index
3b47962a207ad70b99a17547e742f47c09629f24..763684a087031fe9ccb98456177729be5ae97a33
100644
--- a/dm/DMReplayTask.cpp
+++ b/dm/DMReplayTask.cpp
@@ -41,7 +41,7 @@ bool ReplayTask::shouldSkip() const {
     }
 
     if (FLAGS_rtree && fUseRTree) {
-        return false;
+        return fGM->getFlags() & skiagm::GM::kSkipTiled_Flag;
     }
     if (FLAGS_replay && !fUseRTree) {
         return false;

[mtklein, 2014-02-21 18:27:50]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-02-21 18:27:58]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/175283002/1

[commit-bot: I haz the power, 2014-02-21 18:33:27]

Change committed as 13537

[mtklein, 2014-02-21 19:19:33]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-02-21 19:19:44]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/175283002/140001

[commit-bot: I haz the power, 2014-02-21 19:19:49]

Change committed as 13540

[scroggo, 2014-02-21 19:21:27]

https://codereview.chromium.org/175283002/diff/140001/dm/DMReplayTask.cpp
File dm/DMReplayTask.cpp (right):

https://codereview.chromium.org/175283002/diff/140001/dm/DMReplayTask.cpp#new...
dm/DMReplayTask.cpp:44: return (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag)
!= 0;
You don't like SkToBool?

[mtklein, 2014-02-21 19:28:13]

https://codereview.chromium.org/175283002/diff/140001/dm/DMReplayTask.cpp
File dm/DMReplayTask.cpp (right):

https://codereview.chromium.org/175283002/diff/140001/dm/DMReplayTask.cpp#new...
dm/DMReplayTask.cpp:44: return (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag)
!= 0;
On 2014/02/21 19:21:28, scroggo wrote:
> You don't like SkToBool?

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:17]

https://codereview.chromium.org/175283002/diff/140001/dm/DMReplayTask.cpp
File dm/DMReplayTask.cpp (right):

https://codereview.chromium.org/175283002/diff/140001/dm/DMReplayTask.cpp#new...
dm/DMReplayTask.cpp:44: return (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag)
!= 0;
On 2014/02/21 19:28:14, mtklein wrote:
> On 2014/02/21 19:21:28, scroggo wrote:
> > You don't like SkToBool?
> 
> 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.

sgtm