SkRecord: make culling work if SkRecordAnnotateCullingPairs is called.

src/record/SkRecordDraw.cpp

-#ifndef SkRecordDraw_DEFINED
-#define SkRecordDraw_DEFINED
+#include "SkRecordDraw.h"
 
-#include "SkRecord.h"
-#include "SkRecords.h"
-#include "SkCanvas.h"
+namespace {
 
 // This is an SkRecord visitor that will draw that SkRecord to an SkCanvas.
-
-struct SkRecordDraw {
-    explicit SkRecordDraw(SkCanvas* canvas) : canvas(canvas) {}
+struct Draw {
+    unsigned index;
+    SkCanvas* canvas;
 
     // No base case, so we'll be compile-time checked that we implemented all possibilities below.
-    template <typename T> void operator()(const T& record);
-
-    SkCanvas* canvas;
+    template <typename T> void operator()(const T&);
 };
 
-// Nothing fancy here.
-// The structs in SkRecord are completely isomorphic to their corresponding SkCanvas calls.
+template <> void Draw::operator()(const SkRecords::PushCull& pushCull) {
+    if (pushCull.popOffset != SkRecords::kUnsetPopOffset &&
+        canvas->quickReject(pushCull.rect)) {
+        // We skip to the popCull, then the loop moves us just beyond it.
+        index += pushCull.popOffset;
+    } else {
+        canvas->pushCull(pushCull.rect);
+    }
+}
 
-#define CASE(T) template <> void SkRecordDraw::operator()(const SkRecords::T& r)
+// Nothing fancy below here.
+
+#define CASE(T) template <> void Draw::operator()(const SkRecords::T& r)
 
 CASE(Restore) { canvas->restore(); }
 CASE(Save) { canvas->save(r.flags); }
 CASE(SaveLayer) { canvas->saveLayer(r.bounds, r.paint, r.flags); }
 
-CASE(PushCull) { canvas->pushCull(r.rect); }
 CASE(PopCull) { canvas->popCull(); }
 
 CASE(Concat) { canvas->concat(r.matrix); }
 CASE(SetMatrix) { canvas->setMatrix(r.matrix); }
 
 CASE(ClipPath) { canvas->clipPath(r.path, r.op, r.doAA); }
 CASE(ClipRRect) { canvas->clipRRect(r.rrect, r.op, r.doAA); }
 CASE(ClipRect) { canvas->clipRect(r.rect, r.op, r.doAA); }
 CASE(ClipRegion) { canvas->clipRegion(r.region, r.op); }
 
@@ skipping 13 matching lines @@
 CASE(DrawPosTextH) { canvas->drawPosTextH(r.text, r.byteLength, r.xpos, r.y, r.paint); }
 CASE(DrawRRect) { canvas->drawRRect(r.rrect, r.paint); }
 CASE(DrawRect) { canvas->drawRect(r.rect, r.paint); }
 CASE(DrawSprite) { canvas->drawSprite(r.bitmap, r.left, r.top, r.paint); }
 CASE(DrawText) { canvas->drawText(r.text, r.byteLength, r.x, r.y, r.paint); }
 CASE(DrawTextOnPath) { canvas->drawTextOnPath(r.text, r.byteLength, r.path, r.matrix, r.paint); }
 CASE(DrawVertices) {
     canvas->drawVertices(r.vmode, r.vertexCount, r.vertices, r.texs, r.colors,
                          r.xmode.get(), r.indices, r.indexCount, r.paint);
 }
-
 #undef CASE
 
-#endif//SkRecordDraw_DEFINED
+}  // namespace
+
+void SkRecordDraw(const SkRecord& record, SkCanvas* canvas) {
+    Draw draw;
+    draw.canvas = canvas;
+
+    for (draw.index = 0; draw.index < record.count(); draw.index++) {
+        record.visit(draw.index, draw);
+    }
+}
+
+