Minor cleanup (moved out of main CL)

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 86 matching lines @@
     , fPlaybackIndex(0)
     , fSave(false)
     , fValid(true) {
 }
 
 uint32_t SkPictureStateTree::Iterator::draw() {
     SkASSERT(this->isValid());
     if (fPlaybackIndex >= fDraws->count()) {
         // restore back to where we started
         fCanvas->setMatrix(fPlaybackMatrix);
-        if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) { fCanvas->restore(); }
+        if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) { 
+            fCanvas->restore(); 
+        }
         fCurrentNode = fCurrentNode->fParent;
         while (NULL != fCurrentNode) {
-            if (fCurrentNode->fFlags & Node::kSave_Flag) { fCanvas->restore(); }
-            if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) { fCanvas->restore(); }
+            if (fCurrentNode->fFlags & Node::kSave_Flag) { 
+                fCanvas->restore(); 
+            }
+            if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) { 
+                fCanvas->restore(); 
+            }
             fCurrentNode = fCurrentNode->fParent;
         }
         return kDrawComplete;
     }
 
     Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
     Node* targetNode = draw->fNode;
 
     if (fSave) {
         fCanvas->save(SkCanvas::kClip_SaveFlag);
         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
             // an offset for each node on the way down to the target, to apply the desired clips and
             // saveLayers, so it may take several draw() calls before the next draw actually occurs)
             Node* tmp = fCurrentNode;
             Node* ancestor = targetNode;
             while (tmp != ancestor) {
                 uint16_t currentLevel = tmp->fLevel;
                 uint16_t targetLevel = ancestor->fLevel;
                 if (currentLevel >= targetLevel) {
-                    if (tmp != fCurrentNode && tmp->fFlags & Node::kSave_Flag) { fCanvas->restore(); }
-                    if (tmp->fFlags & Node::kSaveLayer_Flag) { fCanvas->restore(); }
+                    if (tmp != fCurrentNode && tmp->fFlags & Node::kSave_Flag) { 
+                        fCanvas->restore(); 
+                    }
+                    if (tmp->fFlags & Node::kSaveLayer_Flag) { 
+                        fCanvas->restore(); 
+                    }
                     tmp = tmp->fParent;
                 }
                 if (currentLevel <= targetLevel) {
                     fNodes.push(ancestor);
                     ancestor = ancestor->fParent;
                 }
             }
 
             if (ancestor->fFlags & Node::kSave_Flag) {
-                if (fCurrentNode != ancestor) { fCanvas->restore(); }
-                if (targetNode != ancestor) { fCanvas->save(SkCanvas::kClip_SaveFlag); }
+                if (fCurrentNode != ancestor) { 
+                    fCanvas->restore(); 
+                }
+                if (targetNode != ancestor) { 
+                    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) {
                 fCurrentMatrix = fNodes.top()->fMatrix;
                 SkMatrix tmp = *fNodes.top()->fMatrix;
@@ skipping 14 matching lines @@
     if (fCurrentMatrix != draw->fMatrix) {
         SkMatrix tmp = *draw->fMatrix;
         tmp.postConcat(fPlaybackMatrix);
         fCanvas->setMatrix(tmp);
         fCurrentMatrix = draw->fMatrix;
     }
 
     ++fPlaybackIndex;
     return draw->fOffset;
 }