Reduce internal explicit SaveFlags usage.

src/core/SkPictureStateTree.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureStateTree.h"
 #include "SkCanvas.h"
@@ skipping 106 matching lines @@
             }
             fCurrentNode = fCurrentNode->fParent;
         }
         return kDrawComplete;
     }
 
     Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
     Node* targetNode = draw->fNode;
 
     if (fSave) {
-        fCanvas->save(SkCanvas::kClip_SaveFlag);
+        fCanvas->save();
         fSave = false;
     }
 
     if (fCurrentNode != targetNode) {
         // If we're not at the target and we don't have a list of nodes to get there, we need to
         // figure out the path from our current node, to the target
         if (fNodes.count() == 0) {
             // Trace back up to a common ancestor, restoring to get our current state to match that
             // of the ancestor, and saving a list of nodes whose state we need to apply to get to
             // the target (we can restore up to the ancestor immediately, but we'll need to return
@@ skipping 17 matching lines @@
                     fNodes.push(ancestor);
                     ancestor = ancestor->fParent;
                 }
             }
 
             if (ancestor->fFlags & Node::kSave_Flag) {
                 if (fCurrentNode != ancestor) {
                     fCanvas->restore();
                 }
                 if (targetNode != ancestor) {
+                    // FIXME: the save below depends on soon-to-be-deprecated
+                    // SaveFlags behavior: it relies on matrix changes persisting
+                    // after restore.
                     fCanvas->save(SkCanvas::kClip_SaveFlag);
                 }
             }
             fCurrentNode = ancestor;
         }
 
         // If we're not at the target node yet, we'll need to return an offset to make the caller
         // apply the next clip or saveLayer.
         if (fCurrentNode != targetNode) {
             if (fCurrentMatrix != fNodes.top()->fMatrix) {
@@ skipping 16 matching lines @@
     if (fCurrentMatrix != draw->fMatrix) {
         SkMatrix tmp = *draw->fMatrix;
         tmp.postConcat(fPlaybackMatrix);
         fCanvas->setMatrix(tmp);
         fCurrentMatrix = draw->fMatrix;
     }
 
     ++fPlaybackIndex;
     return draw->fOffset;
 }