De-parameterize SkNextDatumFunction.

src/core/SkBBHFactory.cpp

Index: src/core/SkBBHFactory.cpp
diff --git a/src/core/SkBBHFactory.cpp b/src/core/SkBBHFactory.cpp
index 7411eb34dab5e7becacb05aee9f531769bbd5c72..21a95fe0582a38fecbe5b96d03b1dfd47ab6d2cc 100644
--- a/src/core/SkBBHFactory.cpp
+++ b/src/core/SkBBHFactory.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkBBHFactory.h"
-#include "SkPictureStateTree.h"
 #include "SkQuadTree.h"
 #include "SkRTree.h"
 #include "SkTileGrid.h"
@@ -39,6 +38,5 @@ SkBBoxHierarchy* SkTileGridFactory::operator()(int width, int height) const {
     // "-1"s below.
     int xTileCount = (width + fInfo.fTileInterval.width() - 1) / fInfo.fTileInterval.width();
     int yTileCount = (height + fInfo.fTileInterval.height() - 1) / fInfo.fTileInterval.height();
-    return SkNEW_ARGS(SkTileGrid, (xTileCount, yTileCount, fInfo,
-                                    SkTileGridNextDatum<SkPictureStateTree::Draw>));
+    return SkNEW_ARGS(SkTileGrid, (xTileCount, yTileCount, fInfo));
 }