Support comment groups in SkRecord.

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 31 matching lines @@
     SkRecord record;
     SkRecorder recorder(&record, 1920, 1080);
 
     recorder.drawRect(SkRect::MakeWH(10, 10), SkPaint());
 
     Tally tally;
     tally.apply(record);
     REPORTER_ASSERT(r, 1 == tally.count<SkRecords::DrawRect>());
 }
 
+// All of Skia will work fine without support for comment groups, but
+// Chrome's inspector can break.  This serves as a simple regression test.
+DEF_TEST(Recorder_CommentGroups, r) {
+    SkRecord record;
+    SkRecorder recorder(&record, 1920, 1080);
+
+    recorder.beginCommentGroup("test");
+        recorder.addComment("foo", "bar");
+        recorder.addComment("baz", "quux");
+    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>());
+}
+
 // 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());
 }