Cleanup SkPicture* classes a bit

src/core/SkPicturePlayback.cpp

Index: src/core/SkPicturePlayback.cpp
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 0c5c74a4fc54457ec79f8edc00fdf6ad436dd420..d16a6353e9d544661d8428778cbe61ed9a1e89f1 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -66,7 +66,7 @@ static SkBitmap shallow_copy(const SkBitmap& bitmap) {
 
 const SkPicture::OperationList* SkPicturePlayback::getActiveOps(const SkCanvas* canvas) {
 
-    if (fUseBBH && NULL != fPictureData->fStateTree && NULL != fPictureData->fBoundingHierarchy) {
+    if (fUseBBH) {
         SkRect clipBounds;
         if (canvas->getClipBounds(&clipBounds)) {
             SkIRect query;
@@ -89,7 +89,7 @@ bool SkPicturePlayback::initIterator(SkPictureStateTree::Iterator* iter,
             return false;  // nothing to draw
         }
 
-        fPictureData->fStateTree->initIterator(iter, activeOpsList->fOps, canvas);
+        fPictureData->initIterator(iter, activeOpsList->fOps, canvas);
     }
 
     return true;