Implement all SkCanvas overrides that SkPictureRecord does.

tests/RecorderTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 
 #include "SkPictureRecorder.h"
@@ skipping 50 matching lines @@
     recorder.endCommentGroup();
 
     Tally tally;
     tally.apply(record);
 
     REPORTER_ASSERT(r, 1 == tally.count<SkRecords::BeginCommentGroup>());
     REPORTER_ASSERT(r, 2 == tally.count<SkRecords::AddComment>());
     REPORTER_ASSERT(r, 1 == tally.count<SkRecords::EndCommentGroup>());
 }
 
+// DrawData is similar to comment groups.  It doesn't affect drawing, but
+// it's a pass-through we provide to the client.  Again, a simple reg. test.
+DEF_TEST(Recorder_DrawData, r) {

[reed1, 2014/09/04 20:53:04]

for a future CL: perhaps this test could/should be written in a generic picture
test, where we record and then play into a custom canvas.

[mtklein, 2014/09/04 20:57:15]

Acknowledged.

+    SkRecord record;
+    SkRecorder recorder(&record, 100, 100);
+
+    const char* data = "This sure is some data, eh?";
+    recorder.drawData(data, strlen(data));
+
+    Tally tally;
+    tally.apply(record);
+    REPORTER_ASSERT(r, 1 == tally.count<SkRecords::DrawData>());
+}
+
 // Regression test for leaking refs held by optional arguments.
 DEF_TEST(Recorder_RefLeaking, r) {
     // We use SaveLayer to test:
     //   - its SkRect argument is optional and SkRect is POD.  Just testing that that works.
     //   - its SkPaint argument is optional and SkPaint is not POD.  The bug was here.
 
     SkRect bounds = SkRect::MakeWH(320, 240);
     SkPaint paint;
     paint.setShader(SkShader::CreateEmptyShader())->unref();
 
@@ skipping 21 matching lines @@
     {
         SkRecord record;
         SkRecorder recorder(&record, 100, 100);
         recorder.drawPicture(pic);
         // the recorder should now also be an owner
         REPORTER_ASSERT(r, !pic->unique());
     }
     // the recorder destructor should have released us (back to unique)
     REPORTER_ASSERT(r, pic->unique());
 }
+
+DEF_TEST(Recorder_IsDrawingToLayer, r) {
+    SkRecord record;
+    SkRecorder recorder(&record, 100, 100);
+
+    // We'll save, saveLayer, save, and saveLayer, then restore them all,
+    // checking that isDrawingToLayer() is correct at each step.
+
+    REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
+    recorder.save();
+        REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
+        recorder.saveLayer(NULL, NULL);
+            REPORTER_ASSERT(r, recorder.isDrawingToLayer());
+            recorder.save();
+                REPORTER_ASSERT(r, recorder.isDrawingToLayer());
+                recorder.saveLayer(NULL, NULL);
+                    REPORTER_ASSERT(r, recorder.isDrawingToLayer());
+                recorder.restore();
+                REPORTER_ASSERT(r, recorder.isDrawingToLayer());
+            recorder.restore();
+            REPORTER_ASSERT(r, recorder.isDrawingToLayer());
+        recorder.restore();
+        REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
+    recorder.restore();
+    REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
+}
+