Revert of Defer saves() until they're needed

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 "RecordTestUtils.h"
 
 #include "SkRecord.h"
 #include "SkRecordOpts.h"
 #include "SkRecorder.h"
 #include "SkRecords.h"
 #include "SkXfermode.h"
 
 static const int W = 1920, H = 1080;
 
-DEF_TEST(RecordOpts_NoopDraw, r) {
+DEF_TEST(RecordOpts_NoopDrawSaveRestore, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
 
-    recorder.drawRect(SkRect::MakeWH(200, 200), SkPaint());
-    recorder.drawRect(SkRect::MakeWH(300, 300), SkPaint());
-    recorder.drawRect(SkRect::MakeWH(100, 100), SkPaint());
+    // 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>(1);  // NoOps should be allowed.
+    record.replace<SkRecords::NoOp>(2);  // NoOps should be allowed.
 
     SkRecordNoopSaveRestores(&record);
 
-    REPORTER_ASSERT(r, 2 == count_instances_of_type<SkRecords::DrawRect>(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(&record, W, H);
 
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(200, 200));
     recorder.restore();
 
@@ skipping 14 matching lines @@
         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();
 
     SkRecordNoopSaveRestores(&record);
-    for (unsigned index = 0; index < record.count(); index++) {
+    for (unsigned index = 0; index < 8; index++) {
         assert_type<SkRecords::NoOp>(r, record, index);
     }
 }
 
 DEF_TEST(RecordOpts_SaveSaveLayerRestoreRestore, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
 
     // A previous bug NoOp'd away the first 3 commands.
     recorder.save();
         recorder.saveLayer(NULL, NULL);
         recorder.restore();
     recorder.restore();
 
     SkRecordNoopSaveRestores(&record);
-    switch (record.count()) {
-        case 4:
-            assert_type<SkRecords::Save>     (r, record, 0);
-            assert_type<SkRecords::SaveLayer>(r, record, 1);
-            assert_type<SkRecords::Restore>  (r, record, 2);
-            assert_type<SkRecords::Restore>  (r, record, 3);
-            break;
-        case 2:
-            assert_type<SkRecords::SaveLayer>(r, record, 0);
-            assert_type<SkRecords::Restore>  (r, record, 1);
-            break;
-        case 0:
-            break;
-        default:
-            REPORTER_ASSERT(r, false);
-    }
+    assert_type<SkRecords::Save>     (r, record, 0);
+    assert_type<SkRecords::SaveLayer>(r, record, 1);
+    assert_type<SkRecords::Restore>  (r, record, 2);
+    assert_type<SkRecords::Restore>  (r, record, 3);
 }
 
 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);
 }