SkRecordDraw: skip draw ops when the clip is empty

   - Adds tests for SkRecordDraw's two main features: cull- and clip- based skipping.
   - Adds full SkCanvas semantic mode to SkRecorder, so it can be used as a target for SkRecordDraw.

BUG=skia:2378
R=fmalita@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

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

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

3 files changed, 66 insertions, 2 deletions

diff --git a/tests/RecordCullingTest.cpp b/tests/RecordCullingTest.cpp
index c6711c6f67..c6fe10e07b 100644
--- a/tests/RecordCullingTest.cpp
+++ b/tests/RecordCullingTest.cpp
@@ -18,7 +18,7 @@ template <> void PushCullScanner::operator()(const SkRecords::PushCull& record)
 
 DEF_TEST(RecordCulling, r) {
     SkRecord record;
-    SkRecorder recorder(&record, 1920, 1080);
+    SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, 1920, 1080);
 
     recorder.drawRect(SkRect::MakeWH(1000, 10000), SkPaint());
 
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
new file mode 100644
index 0000000000..6468e72c9d
--- /dev/null
+++ b/tests/RecordDrawTest.cpp
@@ -0,0 +1,64 @@
+#include "Test.h"
+
+#include "SkDebugCanvas.h"
+#include "SkRecord.h"
+#include "SkRecordCulling.h"
+#include "SkRecordDraw.h"
+#include "SkRecorder.h"
+#include "SkRecords.h"
+
+static const int W = 1920, H = 1080;
+
+DEF_TEST(RecordDraw_Culling, r) {
+    // Record these 7 drawing commands verbatim.
+    SkRecord record;
+    SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H);
+
+    recorder.pushCull(SkRect::MakeWH(100, 100));
+        recorder.drawRect(SkRect::MakeWH(10, 10), SkPaint());
+        recorder.drawRect(SkRect::MakeWH(30, 30), SkPaint());
+        recorder.pushCull(SkRect::MakeWH(5, 5));
+            recorder.drawRect(SkRect::MakeWH(1, 1), SkPaint());
+        recorder.popCull();
+    recorder.popCull();
+
+    // Take a pass over to match up pushCulls and popCulls.
+    SkRecordAnnotateCullingPairs(&record);
+
+    // Rerecord into another SkRecord using full SkCanvas semantics,
+    // tracking clips and allowing SkRecordDraw's quickReject() calls to work.
+    SkRecord rerecord;
+    SkRecorder rerecorder(SkRecorder::kReadWrite_Mode, &rerecord, W, H);
+    // This clip intersects the outer cull, but allows us to quick reject the inner one.
+    rerecorder.clipRect(SkRect::MakeLTRB(20, 20, 200, 200));
+
+    SkRecordDraw(record, &rerecorder);
+
+    // We'll keep the clipRect call from above, and the outer two drawRects, and the push/pop pair.
+    // If culling weren't working, we'd see 8 commands recorded here.
+    REPORTER_ASSERT(r, 5 == rerecord.count());
+}
+
+DEF_TEST(RecordDraw_Clipping, r) {
+    SkRecord record;
+    SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H);
+
+    // 8 draw commands.
+    // The inner clipRect makes the clip empty, so the inner drawRect does nothing.
+    recorder.save();
+        recorder.clipRect(SkRect::MakeLTRB(0, 0, 100, 100));
+        recorder.drawRect(SkRect::MakeLTRB(20, 20, 40, 40), SkPaint());
+        recorder.save();
+            recorder.clipRect(SkRect::MakeLTRB(200, 200, 300, 300));
+            recorder.drawRect(SkRect::MakeLTRB(220, 220, 240, 240), SkPaint());
+        recorder.restore();
+    recorder.restore();
+
+    // Same deal as above: we need full SkCanvas semantics for clip skipping to work.
+    SkRecord rerecord;
+    SkRecorder rerecorder(SkRecorder::kReadWrite_Mode, &rerecord, W, H);
+    SkRecordDraw(record, &rerecorder);
+
+    // All commands except the drawRect will be preserved.
+    REPORTER_ASSERT(r, 7 == rerecord.count());
+}
diff --git a/tests/RecorderTest.cpp b/tests/RecorderTest.cpp
index 3c7b0082b1..1c116beb12 100644
--- a/tests/RecorderTest.cpp
+++ b/tests/RecorderTest.cpp
@@ -25,7 +25,7 @@ private:
 
 DEF_TEST(Recorder, r) {
     SkRecord record;
-    SkRecorder recorder(&record, 1920, 1080);
+    SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, 1920, 1080);
 
     recorder.drawRect(SkRect::MakeWH(10, 10), SkPaint());