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

src/core/SkBBoxHierarchyRecord.cpp

Index: src/core/SkBBoxHierarchyRecord.cpp
===================================================================
--- src/core/SkBBoxHierarchyRecord.cpp	(revision 8135)
+++ src/core/SkBBoxHierarchyRecord.cpp	(working copy)
@@ -8,7 +8,6 @@
 
 #include "SkBBoxHierarchyRecord.h"
 #include "SkPictureStateTree.h"
-#include "SkBBoxHierarchy.h"
 
 SkBBoxHierarchyRecord::SkBBoxHierarchyRecord(uint32_t recordFlags,
                                              SkBBoxHierarchy* h,
@@ -17,6 +16,7 @@
     fStateTree = SkNEW(SkPictureStateTree);
     fBoundingHierarchy = h;
     fBoundingHierarchy->ref();
+    fBoundingHierarchy->setClient(this);
 }
 
 void SkBBoxHierarchyRecord::handleBBox(const SkRect& bounds) {
@@ -103,3 +103,8 @@
     fStateTree->appendClip(this->writeStream().size());
     return INHERITED::clipRRect(rrect, op, doAntiAlias);
 }
+

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

comment? // Why does reverting any Draw state after the writeStream's size work?

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

Done.

+bool SkBBoxHierarchyRecord::shouldRewind(void* data) {
+    SkPictureStateTree::Draw* draw = static_cast<SkPictureStateTree::Draw*>(data);
+    return draw->fOffset >= writeStream().size();
+}