SkRecord: make culling work if SkRecordAnnotateCullingPairs is called.

SkRecord: make culling work if SkRecordAnnotateCullingPairs is called.

  - Allow stateful functors; allow visit()/mutate() at a given index; add count().
  - Annotate cull push/pop pairs on the PushCull records.  (tested)
  - Use those annotations to skip ahead in SkRecordDraw.   (not yet tested beyond dm --skr)
  - Make SkRecordDraw a function, move its implementation to a .cpp.

BUG=skia:2378
Committed: http://code.google.com/p/skia/source/detail?r=14101

[f(malita), 2014-04-08 23:08:31]

lgtm + nits.

https://codereview.chromium.org/229523002/diff/1/src/record/SkRecorder.cpp
File src/record/SkRecorder.cpp (right):

https://codereview.chromium.org/229523002/diff/1/src/record/SkRecorder.cpp#ne...
src/record/SkRecorder.cpp:200: APPEND(PushCull, rect, kImpossiblePopOffset);
If using a constant here, maybe we should promote it and also use it for the
check in Draw::operator()

https://codereview.chromium.org/229523002/diff/1/tests/RecorderTest.cpp
File tests/RecorderTest.cpp (right):

https://codereview.chromium.org/229523002/diff/1/tests/RecorderTest.cpp#newco...
tests/RecorderTest.cpp:14: Tally() { bzero(&fHistogram, sizeof(fHistogram)); }
sk_bzero?

[mtklein, 2014-04-08 23:11:56]

https://codereview.chromium.org/229523002/diff/1/src/record/SkRecorder.cpp
File src/record/SkRecorder.cpp (right):

https://codereview.chromium.org/229523002/diff/1/src/record/SkRecorder.cpp#ne...
src/record/SkRecorder.cpp:200: APPEND(PushCull, rect, kImpossiblePopOffset);
On 2014/04/08 23:08:31, Florin Malita wrote:
> If using a constant here, maybe we should promote it and also use it for the
> check in Draw::operator()

Done.

https://codereview.chromium.org/229523002/diff/1/tests/RecorderTest.cpp
File tests/RecorderTest.cpp (right):

https://codereview.chromium.org/229523002/diff/1/tests/RecorderTest.cpp#newco...
tests/RecorderTest.cpp:14: Tally() { bzero(&fHistogram, sizeof(fHistogram)); }
On 2014/04/08 23:08:31, Florin Malita wrote:
> sk_bzero?

ooooops, done.

[mtklein, 2014-04-08 23:12:18]

lgtm

[mtklein, 2014-04-08 23:12:48]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-04-08 23:12:51]

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

[commit-bot: I haz the power, 2014-04-08 23:12:56]

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

[commit-bot: I haz the power, 2014-04-08 23:12:57]

Failed to apply patch for tests/RecorderTest.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file tests/RecorderTest.cpp
  Hunk #2 FAILED at 29.
  1 out of 2 hunks FAILED -- saving rejects to file tests/RecorderTest.cpp.rej

Patch:       tests/RecorderTest.cpp
Index: tests/RecorderTest.cpp
diff --git a/tests/RecorderTest.cpp b/tests/RecorderTest.cpp
index
e04a9e9f6033d1919411cca3d0f5f5f93085de46..3c7b0082b1a71475a48edad368807606da3e1f9b
100644
--- a/tests/RecorderTest.cpp
+++ b/tests/RecorderTest.cpp
@@ -8,17 +8,19 @@
 static const int kRecordTypes = SK_RECORD_TYPES(COUNT);
 #undef COUNT
 
-// Tallies the types of commands it sees into histogram.
+// Tallies the types of commands it sees into a histogram.
 class Tally {
 public:
-    explicit Tally(int histogram[kRecordTypes]) : fHistogram(histogram) {}
+    Tally() { sk_bzero(&fHistogram, sizeof(fHistogram)); }
 
-    template <typename T> void operator()(const T&) {
-        ++fHistogram[T::kType];
-    }
+    template <typename T>
+    void operator()(const T&) { ++fHistogram[T::kType]; }
+
+    template <typename T>
+    int count() const { return fHistogram[T::kType]; }
 
 private:
-    int* fHistogram;
+    int fHistogram[kRecordTypes];
 };
 
 DEF_TEST(Recorder, r) {
@@ -27,10 +29,8 @@ DEF_TEST(Recorder, r) {
 
     recorder.drawRect(SkRect::MakeWH(10, 10), SkPaint());
 
-    int histogram[kRecordTypes];
-    bzero(&histogram, sizeof(histogram));
-
-    record.visit(Tally(histogram));
+    Tally tally;
+    record.visit(tally);
 
-    REPORTER_ASSERT(r, 1 == histogram[SkRecords::DrawRect::kType]);
+    REPORTER_ASSERT(r, 1 == tally.count<SkRecords::DrawRect>());
 }

[mtklein, 2014-04-08 23:15:55]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-04-08 23:16:02]

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

[commit-bot: I haz the power, 2014-04-08 23:32:09]

Change committed as 14101