save-draw*-restore -> noop-draw*-noop

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 90 matching lines @@
 
     const SkRecords::BoundedDrawPosTextH* bounded =
         assert_type<SkRecords::BoundedDrawPosTextH>(r, record, 0);
 
     const SkPaint defaults;
     REPORTER_ASSERT(r, bounded->base == original);
     REPORTER_ASSERT(r, bounded->minY <= SK_Scalar1 - defaults.getTextSize());
     REPORTER_ASSERT(r, bounded->maxY >= SK_Scalar1 + defaults.getTextSize());
 }
 
+DEF_TEST(RecordOpts_NoopDrawSaveRestore, r) {
+    SkRecord record;
+    SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H);
+
+    // The save and restore are pointless if there's only draw commands in the middle.
+    recorder.save();
+        recorder.drawRect(SkRect::MakeWH(200, 200), SkPaint());
+        recorder.drawRect(SkRect::MakeWH(300, 300), SkPaint());
+        recorder.drawRect(SkRect::MakeWH(100, 100), SkPaint());
+    recorder.restore();
+
+    record.replace<SkRecords::NoOp>(2);  // NoOps should be allowed.
+
+    SkRecordNoopSaveRestores(&record);
+
+    assert_type<SkRecords::NoOp>(r, record, 0);
+    assert_type<SkRecords::DrawRect>(r, record, 1);
+    assert_type<SkRecords::NoOp>(r, record, 2);
+    assert_type<SkRecords::DrawRect>(r, record, 3);
+    assert_type<SkRecords::NoOp>(r, record, 4);
+}
+
 DEF_TEST(RecordOpts_SingleNoopSaveRestore, r) {
     SkRecord record;
     SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H);
 
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(200, 200));
     recorder.restore();
 
     SkRecordNoopSaveRestores(&record);
     for (unsigned i = 0; i < 3; i++) {
@@ skipping 11 matching lines @@
         recorder.save();
         recorder.restore();
 
         // As long as we don't draw in there, everything is a noop.
         recorder.save();
             recorder.clipRect(SkRect::MakeWH(200, 200));
             recorder.clipRect(SkRect::MakeWH(100, 100));
         recorder.restore();
     recorder.restore();
 
-    // These will be kept (though some future optimization might noop the save and restore).
-    recorder.save();
-        recorder.drawRect(SkRect::MakeWH(200, 200), SkPaint());
-    recorder.restore();
-
     SkRecordNoopSaveRestores(&record);
-
     for (unsigned index = 0; index < 8; index++) {
         assert_type<SkRecords::NoOp>(r, record, index);
     }
-    assert_type<SkRecords::Save>(r, record, 8);
-    assert_type<SkRecords::DrawRect>(r, record, 9);
-    assert_type<SkRecords::Restore>(r, record, 10);
 }
 
 static void assert_savelayer_restore(skiatest::Reporter* r,
                                      SkRecord* record,
                                      unsigned i,
                                      bool shouldBeNoOped) {
     SkRecordNoopSaveLayerDrawRestores(record);
     if (shouldBeNoOped) {
         assert_type<SkRecords::NoOp>(r, *record, i);
         assert_type<SkRecords::NoOp>(r, *record, i+2);
@@ skipping 54 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);
 }