Noop away PushCull/PopCull pairs with nothing between them.

tests/RecordOptsTest.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 "SkRecord.h"
@@ skipping 42 matching lines @@
             recorder.drawRect(SkRect::MakeWH(1, 1), SkPaint());
         recorder.popCull();
     recorder.popCull();
 
     SkRecordAnnotateCullingPairs(&record);
 
     REPORTER_ASSERT(r, 6 == assert_type<SkRecords::PairedPushCull>(r, record, 1)->skip);
     REPORTER_ASSERT(r, 2 == assert_type<SkRecords::PairedPushCull>(r, record, 4)->skip);
 }
 
+DEF_TEST(RecordOpts_NoopCulls, r) {
+    SkRecord record;
+    SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H);
+
+    // All should be nooped.
+    recorder.pushCull(SkRect::MakeWH(200, 200));
+        recorder.pushCull(SkRect::MakeWH(100, 100));
+        recorder.popCull();
+    recorder.popCull();
+
+    // Kept for now.  We could peel off a layer of culling.
+    recorder.pushCull(SkRect::MakeWH(5, 5));
+        recorder.pushCull(SkRect::MakeWH(5, 5));
+            recorder.drawRect(SkRect::MakeWH(1, 1), SkPaint());
+        recorder.popCull();
+    recorder.popCull();
+
+    SkRecordNoopCulls(&record);
+
+    for (unsigned i = 0; i < 4; i++) {
+        assert_type<SkRecords::NoOp>(r, record, i);
+    }
+    assert_type<SkRecords::PushCull>(r, record, 4);
+    assert_type<SkRecords::PushCull>(r, record, 5);
+    assert_type<SkRecords::DrawRect>(r, record, 6);
+    assert_type<SkRecords::PopCull>(r, record, 7);
+    assert_type<SkRecords::PopCull>(r, record, 8);
+}
+
 static void draw_pos_text(SkCanvas* canvas, const char* text, bool constantY) {
     const size_t len = strlen(text);
     SkAutoTMalloc<SkPoint> pos(len);
     for (size_t i = 0; i < len; i++) {
         pos[i].fX = (SkScalar)i;
         pos[i].fY = constantY ? SK_Scalar1 : (SkScalar)i;
     }
     canvas->drawPosText(text, len, pos, SkPaint());
 }
 
@@ skipping 158 matching lines @@
     // SaveLayer/Restore removed: we can fold in the alpha!
     recorder.saveLayer(NULL, &goodLayerPaint);
         recorder.drawRect(draw, goodDrawPaint);
     recorder.restore();
     assert_savelayer_restore(r, &record, 15, true);
 
     const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, record, 16);
     REPORTER_ASSERT(r, drawRect != NULL);
     REPORTER_ASSERT(r, drawRect->paint.getColor() == 0x03020202);
 }