Staging for cleanup of SkPicture-related headers

include/core/SkRTreePicture.h

Index: include/core/SkRTreePicture.h
===================================================================
--- include/core/SkRTreePicture.h	(revision 14252)
+++ include/core/SkRTreePicture.h	(working copy)
@@ -8,16 +8,14 @@
 #ifndef SkRTreePicture_DEFINED
 #define SkRTreePicture_DEFINED
 
-#include "SkPicture.h"
+#ifdef SK_SUPPORT_LEGACY_PICTURE_HEADERS
+#include "SkBBHFactory.h"
+#endif
 
-class SkRTreeFactory : public SkBBHFactory {
-public:
-    virtual SkBBoxHierarchy* operator()(int width, int height) const SK_OVERRIDE;
-private:
-    typedef SkBBHFactory INHERITED;
-};
-
 #ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
+
+#include "SkPicture.h"
+
 /**
  * Subclass of SkPicture that creates an RTree acceleration structure.
  */