Revert of Defer saves() until they're needed

tests/RecordReplaceDrawTest.cpp

Index: tests/RecordReplaceDrawTest.cpp
diff --git a/tests/RecordReplaceDrawTest.cpp b/tests/RecordReplaceDrawTest.cpp
index e0e9466a2e674166908f9ec686c41e6404d57328..f1ebf82de0e72f0de2e75440ddba6a9fd34597c9 100644
--- a/tests/RecordReplaceDrawTest.cpp
+++ b/tests/RecordReplaceDrawTest.cpp
@@ -52,18 +52,10 @@
     JustOneDraw callback;
     GrRecordReplaceDraw(pic, &canvas, NULL, SkMatrix::I(), &callback);
 
-    switch (rerecord.count()) {
-        case 3:
-            assert_type<SkRecords::Save>(r, rerecord, 0);
-            assert_type<SkRecords::DrawRect>(r, rerecord, 1);
-            assert_type<SkRecords::Restore>(r, rerecord, 2);
-            break;
-        case 1:
-            assert_type<SkRecords::DrawRect>(r, rerecord, 0);
-            break;
-        default:
-            REPORTER_ASSERT(r, false);
-    }
+    REPORTER_ASSERT(r, 3 == rerecord.count());
+    assert_type<SkRecords::Save>(r, rerecord, 0);
+    assert_type<SkRecords::DrawRect>(r, rerecord, 1);
+    assert_type<SkRecords::Restore>(r, rerecord, 2);
 }
 
 // Make sure GrRecordReplaceDraw balances unbalanced saves
@@ -76,7 +68,7 @@
 
         // We won't balance this, but GrRecordReplaceDraw will for us.
         canvas->save();
-        canvas->scale(2, 2);
+
         pic.reset(recorder.endRecording());
     }
 
@@ -85,8 +77,11 @@
 
     GrRecordReplaceDraw(pic, &canvas, NULL, SkMatrix::I(), NULL/*callback*/);
 
-    // ensure rerecord is balanced (in this case by checking that the count is even)
-    REPORTER_ASSERT(r, (rerecord.count() & 1) == 0);
+    REPORTER_ASSERT(r, 4 == rerecord.count());
+    assert_type<SkRecords::Save>(r, rerecord, 0);
+    assert_type<SkRecords::Save>(r, rerecord, 1);
+    assert_type<SkRecords::Restore>(r, rerecord, 2);
+    assert_type<SkRecords::Restore>(r, rerecord, 3);
 }
 
 // Test out the layer replacement functionality with and w/o a BBH
@@ -132,22 +127,14 @@
     SkRecorder canvas(&rerecord, kWidth, kHeight);
     GrRecordReplaceDraw(pic, &canvas, layerCache, SkMatrix::I(), NULL/*callback*/);
 
-    int recount = rerecord.count();
-    REPORTER_ASSERT(r, 5 == recount || 7 == recount);
-
-    int index = 0;
-    if (7 == recount) {
-        assert_type<SkRecords::Save>(r, rerecord, 0);
-        index += 1;
-    }
-    assert_type<SkRecords::Save>(r, rerecord, index + 0);
-    assert_type<SkRecords::SetMatrix>(r, rerecord, index + 1);
-    assert_type<SkRecords::DrawBitmapRectToRect>(r, rerecord, index + 2);
-    assert_type<SkRecords::Restore>(r, rerecord, index + 3);
-    assert_type<SkRecords::DrawRect>(r, rerecord, index + 4);
-    if (7 == recount) {
-        assert_type<SkRecords::Restore>(r, rerecord, 6);
-    }
+    REPORTER_ASSERT(r, 7 == rerecord.count());
+    assert_type<SkRecords::Save>(r, rerecord, 0);
+    assert_type<SkRecords::Save>(r, rerecord, 1);
+    assert_type<SkRecords::SetMatrix>(r, rerecord, 2);
+    assert_type<SkRecords::DrawBitmapRectToRect>(r, rerecord, 3);
+    assert_type<SkRecords::Restore>(r, rerecord, 4);
+    assert_type<SkRecords::DrawRect>(r, rerecord, 5);
+    assert_type<SkRecords::Restore>(r, rerecord, 6);
 }
 
 DEF_GPUTEST(RecordReplaceDraw, r, factory) {