Plumbing for using a BBH in SkRecordDraw.

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index c733e532c291bb64bb5eb52c42991d4ae57e56d1..e3b33e9438618267b865e0e264e1c46919ab7843 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -20,7 +20,6 @@
 class GrContext;
 #endif
 
-class SkBBHFactory;
 class SkBBoxHierarchy;
 class SkCanvas;
 class SkData;
@@ -289,8 +288,11 @@ private:
 
     typedef SkRefCnt INHERITED;
 
-    SkPicture(int width, int height, SkRecord*);  // Takes ownership.
-    SkAutoTDelete<SkRecord> fRecord;
+    // Takes ownership of the SkRecord, refs the (optional) BBH.
+    SkPicture(int width, int height, SkRecord*, SkBBoxHierarchy*);
+
+    SkAutoTDelete<SkRecord>       fRecord;
+    SkAutoTUnref<SkBBoxHierarchy> fBBH;
     bool fRecordWillPlayBackBitmaps; // TODO: const
 };