Revert of Defer saves() until they're needed

tests/RecordDrawTest.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"
 
@@ skipping 12 matching lines @@
 
 class JustOneDraw : public SkDrawPictureCallback {
 public:
     JustOneDraw() : fCalls(0) {}
 
     virtual bool abortDrawing() SK_OVERRIDE { return fCalls++ > 0; }
 private:
     int fCalls;
 };
 
-DEF_TEST(RecordDraw_LazySaves, r) {
-    // Record two commands.
-    SkRecord record;
-    SkRecorder recorder(&record, W, H);
-
-    REPORTER_ASSERT(r, 0 == record.count());
-    recorder.save();
-    REPORTER_ASSERT(r, 0 == record.count());    // the save was not recorded (yet)
-    recorder.drawColor(SK_ColorRED);
-    REPORTER_ASSERT(r, 1 == record.count());
-    recorder.scale(2, 2);
-    REPORTER_ASSERT(r, 3 == record.count());    // now we see the save
-    recorder.restore();
-    REPORTER_ASSERT(r, 4 == record.count());
-
-    assert_type<SkRecords::DrawPaint>(r, record, 0);
-    assert_type<SkRecords::Save>     (r, record, 1);
-    assert_type<SkRecords::SetMatrix>(r, record, 2);
-    assert_type<SkRecords::Restore>  (r, record, 3);
-
-    recorder.save();
-    recorder.save();
-    recorder.restore();
-    recorder.restore();
-    REPORTER_ASSERT(r, 4 == record.count());
-}
-
 DEF_TEST(RecordDraw_Abort, r) {
     // Record two commands.
     SkRecord record;
     SkRecorder recorder(&record, W, H);
     recorder.drawRect(SkRect::MakeWH(200, 300), SkPaint());
     recorder.clipRect(SkRect::MakeWH(100, 200));
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, W, H);
 
     JustOneDraw callback;
     SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL/*bbh*/, &callback);
 
-    REPORTER_ASSERT(r, 1 == count_instances_of_type<SkRecords::DrawRect>(rerecord));
-    REPORTER_ASSERT(r, 0 == count_instances_of_type<SkRecords::ClipRect>(rerecord));
+    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);
 }
 
 DEF_TEST(RecordDraw_Unbalanced, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
     recorder.save();  // We won't balance this, but SkRecordDraw will for us.
-    recorder.scale(2, 2);
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, W, H);
     SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL/*bbh*/, NULL/*callback*/);
 
-    int save_count = count_instances_of_type<SkRecords::Save>(rerecord);
-    int restore_count = count_instances_of_type<SkRecords::Save>(rerecord);
-    REPORTER_ASSERT(r, save_count == restore_count);
+    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);
 }
 
 DEF_TEST(RecordDraw_SetMatrixClobber, r) {
     // Set up an SkRecord that just scales by 2x,3x.
     SkRecord scaleRecord;
     SkRecorder scaleCanvas(&scaleRecord, W, H);
     SkMatrix scale;
     scale.setScale(2, 3);
     scaleCanvas.setMatrix(scale);
 
@@ skipping 110 matching lines @@
     SkRecord record;
     SkRecorder recorder(&record, kWidth, kHeight);
     recorder.drawRect(r1, p);
     recorder.drawRect(r2, p);
     recorder.drawRect(r3, p);
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, kWidth, kHeight);
     SkRecordPartialDraw(record, &canvas, NULL, 0, 1, 2, SkMatrix::I()); // replay just drawRect of r2
 
-    REPORTER_ASSERT(r, 1 == count_instances_of_type<SkRecords::DrawRect>(rerecord));
-    int index = find_first_instances_of_type<SkRecords::DrawRect>(rerecord);
-    const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, index);
+    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);
+
+    const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, 1);
     REPORTER_ASSERT(r, drawRect->rect == r2);
 }
 
 // A regression test for crbug.com/415468 and skbug.com/2957.
 //
 // This also now serves as a regression test for crbug.com/418417.  We used to adjust the
 // bounds for the saveLayer, clip, and restore to be greater than the bounds of the picture.
 // (We were applying the saveLayer paint to the bounds after restore, which makes no sense.)
 DEF_TEST(RecordDraw_SaveLayerAffectsClipBounds, r) {
     SkRecord record;
@@ skipping 91 matching lines @@
 
     {
         SkRecord record;
         SkRecorder recorder(&record, 10, 10);
         recorder.drawImageRect(image, 0, SkRect::MakeWH(10, 10));
         SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
     }
     REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
 
 }