Staging for cleanup of SkPicture-related headers

src/core/SkQuadTreePicture.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkQuadTreePicture_DEFINED
 #define SkQuadTreePicture_DEFINED
 
-#include "SkPicture.h"
-
-class SkQuadTreeFactory : public SkBBHFactory {
-public:
-    virtual SkBBoxHierarchy* operator()(int width, int height) const SK_OVERRIDE;
-private:
-    typedef SkBBHFactory INHERITED;
-};
+#ifdef SK_SUPPORT_LEGACY_PICTURE_HEADERS
+#include "SkBBHFactory.h"
+#endif
 
 #ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
 
+#include "SkPicture.h"
 #include "SkRect.h"
 
 /**
  * Subclass of SkPicture that creates an SkQuadGrid
  * structure. The quad tree has generally faster
  * tree creation time, but slightly slower query times, as compared to
  * R-Tree, so some cases may be faster and some cases slower.
  */
 class SK_API SkQuadTreePicture : public SkPicture {
 public:
@@ skipping 13 matching lines @@
         return SkNEW_ARGS(SkQuadTreePicture, (SkIRect::MakeWH(width, height)));
     }
 
 private:
     typedef SkPictureFactory INHERITED;
 };
 
 #endif
 
 #endif