Fixing SkPicture command pattern optimizations to make them work correctly with bounding box hierar…

src/core/SkPictureStateTree.h

Index: src/core/SkPictureStateTree.h
===================================================================
--- src/core/SkPictureStateTree.h	(revision 8135)
+++ src/core/SkPictureStateTree.h	(working copy)
@@ -63,6 +63,13 @@
     void appendClip(uint32_t offset);
 
     /**
+     * Call this immediately after an appendRestore call that is associated
+     * a save or saveLayer that was removed from the command stream
+     * due to a command pattern optimization in SkPicture.
+     */
+    void saveCollapsed();
+
+    /**
      * Playback helper
      */
     class Iterator {
@@ -109,6 +116,7 @@
 
     SkChunkAlloc fAlloc;
     Node* fRoot;

[robertphillips, 2013/03/14 18:55:44]

Do we want a comment like: // ideally the state tree would be doubly linked so
we could XXX but for right now we allow one level patches
I'm thinking about the case where we apply the peephole optimizations
iteratively and we can get consecutive collapses.

[Justin Novosad, 2013/03/14 20:04:14]

Done.

+    Node* fLastRestoredNode;
 
     // The currently active state
     Draw fCurrentState;