Staged removal of SkPicture-derived classes

src/core/SkRTreePicture.cpp

Index: src/core/SkRTreePicture.cpp
===================================================================
--- src/core/SkRTreePicture.cpp	(revision 14237)
+++ src/core/SkRTreePicture.cpp	(working copy)
@@ -9,7 +9,22 @@
 
 #include "SkRTree.h"
 
+SkBBoxHierarchy* SkRTreeFactory::operator()(int width, int height) const {
+    // These values were empirically determined to produce reasonable
+    // performance in most cases.
+    static const int kRTreeMinChildren = 6;
+    static const int kRTreeMaxChildren = 11;
 
+    SkScalar aspectRatio = SkScalarDiv(SkIntToScalar(width),
+                                       SkIntToScalar(height));
+    bool sortDraws = false;  // Do not sort draw calls when bulk loading.
+
+    return SkRTree::Create(kRTreeMinChildren, kRTreeMaxChildren,
+                           aspectRatio, sortDraws);
+}
+
+#ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
+
 SkBBoxHierarchy* SkRTreePicture::createBBoxHierarchy() const {
     // These values were empirically determined to produce reasonable
     // performance in most cases.
@@ -23,3 +38,5 @@
     return SkRTree::Create(kRTreeMinChildren, kRTreeMaxChildren,
                            aspectRatio, sortDraws);
 }
+
+#endif