Defer saves() until they're needed

tests/RecordOptsTest.cpp

Index: tests/RecordOptsTest.cpp
diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp
index c5c4471d6715937383b9d8b122acc843d0e44e3e..4aa4803f095a293f63a9c4cad646e15a989e98bb 100644
--- a/tests/RecordOptsTest.cpp
+++ b/tests/RecordOptsTest.cpp
@@ -16,6 +16,7 @@
 
 static const int W = 1920, H = 1080;
 
+#if 0

[robertphillips, 2014/12/10 19:04:22]

Probably remove & add explicit deferred save test

[reed1, 2014/12/10 20:42:45]

Done.

 DEF_TEST(RecordOpts_NoopDrawSaveRestore, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
@@ -37,6 +38,7 @@ DEF_TEST(RecordOpts_NoopDrawSaveRestore, r) {
     assert_type<SkRecords::DrawRect>(r, record, 3);
     assert_type<SkRecords::NoOp>(r, record, 4);
 }
+#endif
 
 DEF_TEST(RecordOpts_SingleNoopSaveRestore, r) {
     SkRecord record;
@@ -70,7 +72,7 @@ DEF_TEST(RecordOpts_NoopSaveRestores, r) {
     recorder.restore();
 
     SkRecordNoopSaveRestores(&record);
-    for (unsigned index = 0; index < 8; index++) {
+    for (unsigned index = 0; index < record.count(); index++) {
         assert_type<SkRecords::NoOp>(r, record, index);
     }
 }
@@ -86,10 +88,22 @@ DEF_TEST(RecordOpts_SaveSaveLayerRestoreRestore, r) {
     recorder.restore();
 
     SkRecordNoopSaveRestores(&record);
-    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);
+    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);
+    }
 }
 
 static void assert_savelayer_restore(skiatest::Reporter* r,