save-draw*-restore -> noop-draw*-noop

src/record/SkRecordOpts.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 "SkRecordOpts.h"
 
 #include "SkRecordPattern.h"
@@ skipping 24 matching lines @@
     typename Pass::Pattern pattern;
     bool changed = false;
     unsigned begin, end = 0;
 
     while (pattern.search(record, &begin, &end)) {
         changed |= pass->onMatch(record, &pattern, begin, end);
     }
     return changed;
 }
 
+// Turns the logical NoOp Save and Restore in Save-Draw*-Restore patterns into actual NoOps.
+struct SaveOnlyDrawsRestoreNooper {
+    typedef Pattern3<Is<Save>,
+                     Star<Or<Is<NoOp>, IsDraw> >,
+                     Is<Restore> >
+        Pattern;
+
+    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
+        record->replace<NoOp>(begin);  // Save
+        record->replace<NoOp>(end-1);  // Restore
+        return true;
+    }
+};
 // Turns logical no-op Save-[non-drawing command]*-Restore patterns into actual no-ops.
-struct SaveRestoreNooper {
+struct SaveNoDrawsRestoreNooper {
     // Star matches greedily, so we also have to exclude Save and Restore.
     typedef Pattern3<Is<Save>,
                      Star<Not<Or3<Is<Save>,
                                   Is<Restore>,
                                   IsDraw> > >,
                      Is<Restore> >
         Pattern;
 
     bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
         // If restore doesn't revert both matrix and clip, this isn't safe to noop away.
         if (pattern->first<Save>()->flags != SkCanvas::kMatrixClip_SaveFlag) {
             return false;
         }
 
         // The entire span between Save and Restore (inclusively) does nothing.
         for (unsigned i = begin; i < end; i++) {
             record->replace<NoOp>(i);
         }
         return true;
     }
 };
 void SkRecordNoopSaveRestores(SkRecord* record) {
-    SaveRestoreNooper pass;
-    while (apply(&pass, record));  // Run until it stops changing things.
+    SaveOnlyDrawsRestoreNooper onlyDraws;
+    SaveNoDrawsRestoreNooper noDraws;
+
+    // Run until they stop changing things.
+    while (apply(&onlyDraws, record) || apply(&noDraws, record));
 }
 
 // For some SaveLayer-[drawing command]-Restore patterns, merge the SaveLayer's alpha into the
 // draw, and no-op the SaveLayer and Restore.
 struct SaveLayerDrawRestoreNooper {
     typedef Pattern3<Is<SaveLayer>, IsDraw, Is<Restore> > Pattern;
 
     bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
         SaveLayer* saveLayer = pattern->first<SaveLayer>();
         if (saveLayer->bounds != NULL) {
@@ skipping 178 matching lines @@
     };
 
     SkTDArray<Pair> fPushStack;
     SkRecord* fRecord;
     unsigned fIndex;
 };
 void SkRecordAnnotateCullingPairs(SkRecord* record) {
     CullAnnotator pass;
     pass.apply(record);
 }