Fix rendering artifacts in pull-saveLayers-forward mode

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 96 matching lines @@
     }
 
     // The matrix is in recording space, but we also inherit
     // a playback matrix from out target canvas.
     SkMatrix m = *matrix;
     m.postConcat(fPlaybackMatrix);
     fCanvas->setMatrix(m);
     fCurrentMatrix = matrix;
 }
 
-uint32_t SkPictureStateTree::Iterator::peekDraw() {
-    SkASSERT(this->isValid());
-    if (fPlaybackIndex >= fDraws->count()) {
-        return kDrawComplete;
-    }
-
-    Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
-    return draw->fOffset;
-}
-
-uint32_t SkPictureStateTree::Iterator::skipDraw() {
-    SkASSERT(this->isValid());
-    if (fPlaybackIndex >= fDraws->count()) {
-        return this->finish();
-    }
-
-    Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
-
-    if (fSave) {
-        fCanvas->save();
-        fSave = false;
-    }
-
-    fNodes.rewind();
-
-    ++fPlaybackIndex;
-    return draw->fOffset;
-}
-
 uint32_t SkPictureStateTree::Iterator::finish() {
     if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
         fCanvas->restore();
     }
 
     for (fCurrentNode = fCurrentNode->fParent; fCurrentNode;
             fCurrentNode = fCurrentNode->fParent) {
         // Note: we call restore() twice when both flags are set.
         if (fCurrentNode->fFlags & Node::kSave_Flag) {
             fCanvas->restore();
@@ skipping 80 matching lines @@
         }
     }
 
     // If we got this far, the clip/saveLayer state is all set, so we can proceed to set the matrix
     // for the draw, and return its offset.
     this->setCurrentMatrix(draw->fMatrix);
 
     ++fPlaybackIndex;
     return draw->fOffset;
 }