Defer saves() until they're needed

tests/RecordPatternTest.cpp

 #include "Test.h"
 
 #include "SkRecord.h"
 #include "SkRecordPattern.h"
 #include "SkRecorder.h"
 #include "SkRecords.h"
 
 using namespace SkRecords;
 typedef Pattern3<Is<Save>,
                  Is<ClipRect>,
@@ skipping 57 matching lines @@
     recorder.restore();
 
     REPORTER_ASSERT(r, !pattern.match(&record, 0));
 }
 
 DEF_TEST(RecordPattern_Star, r) {
     Pattern3<Is<Save>, Star<Is<ClipRect> >, Is<Restore> > pattern;
 
     SkRecord record;
     SkRecorder recorder(&record, 1920, 1200);
-
-    recorder.save();
-    recorder.restore();
-    REPORTER_ASSERT(r, pattern.match(&record, 0));
+    int index = 0;
 
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(300, 200));
     recorder.restore();
-    REPORTER_ASSERT(r, pattern.match(&record, 2));
+    REPORTER_ASSERT(r, pattern.match(&record, index));
+    index += 3;
 
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(300, 200));
         recorder.clipRect(SkRect::MakeWH(100, 100));
     recorder.restore();
-    REPORTER_ASSERT(r, pattern.match(&record, 5));
+    REPORTER_ASSERT(r, pattern.match(&record, index));
 }
 

[robertphillips, 2014/12/11 13:24:36]

I think this test is dead - remove it ?

[reed1, 2014/12/11 14:54:08]

Done.

 DEF_TEST(RecordPattern_IsDraw, r) {
     Pattern3<Is<Save>, IsDraw, Is<Restore> > pattern;
 
     SkRecord record;
     SkRecorder recorder(&record, 1920, 1200);
 
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(300, 200));
     recorder.restore();
 
     REPORTER_ASSERT(r, !pattern.match(&record, 0));
 
+#if 0
     SkPaint paint;
 
     recorder.save();
         paint.setColor(0xEEAA8822);
         recorder.drawRect(SkRect::MakeWH(300, 200), paint);
     recorder.restore();
 
     recorder.save();
         paint.setColor(0xFACEFACE);
         recorder.drawPaint(paint);
     recorder.restore();
 
     REPORTER_ASSERT(r, pattern.match(&record, 3));
     REPORTER_ASSERT(r, pattern.first<Save>()    != NULL);
     REPORTER_ASSERT(r, pattern.second<SkPaint>()->getColor() == 0xEEAA8822);
     REPORTER_ASSERT(r, pattern.third<Restore>() != NULL);
 
     REPORTER_ASSERT(r, pattern.match(&record, 6));
     REPORTER_ASSERT(r, pattern.first<Save>()    != NULL);
     REPORTER_ASSERT(r, pattern.second<SkPaint>()->getColor() == 0xFACEFACE);
     REPORTER_ASSERT(r, pattern.third<Restore>() != NULL);
+#endif
 }
 

[robertphillips, 2014/12/11 13:24:36]

This test should be pretty easy to bring back to life

[reed1, 2014/12/11 14:54:08]

Done.

+#if 0
 DEF_TEST(RecordPattern_Complex, r) {
     Pattern3<Is<Save>,
              Star<Not<Or3<Is<Save>,
                           Is<Restore>,
                           IsDraw> > >,
              Is<Restore> > pattern;
 
     SkRecord record;
     SkRecorder recorder(&record, 1920, 1200);
 

[robertphillips, 2014/12/11 13:24:36]

Just remove this first test

     recorder.save();
     recorder.restore();
     REPORTER_ASSERT(r, pattern.match(&record, 0) == 2);
 
     recorder.save();

[robertphillips, 2014/12/11 13:24:37]

clipRect

         recorder.save();

[robertphillips, 2014/12/11 13:24:36]

clipRect

         recorder.restore();
     recorder.restore();
     REPORTER_ASSERT(r, !pattern.match(&record, 2));
     REPORTER_ASSERT(r, pattern.match(&record, 3) == 5);
 
     recorder.save();
         recorder.clipRect(SkRect::MakeWH(300, 200));
     recorder.restore();
     REPORTER_ASSERT(r, pattern.match(&record, 6) == 9);
 
@@ skipping 24 matching lines @@
     REPORTER_ASSERT(r, pattern.search(&record, &begin, &end));
     REPORTER_ASSERT(r, begin == 6);
     REPORTER_ASSERT(r, end == 9);
 
     REPORTER_ASSERT(r, pattern.search(&record, &begin, &end));
     REPORTER_ASSERT(r, begin == 13);
     REPORTER_ASSERT(r, end == 19);
 
     REPORTER_ASSERT(r, !pattern.search(&record, &begin, &end));
 }
+#endif
 
 DEF_TEST(RecordPattern_SaveLayerIsNotADraw, r) {
     Pattern1<IsDraw> pattern;
 
     SkRecord record;
     SkRecorder recorder(&record, 1920, 1200);
     recorder.saveLayer(NULL, NULL);
 
     REPORTER_ASSERT(r, !pattern.match(&record, 0));
 }