Staged removal of SkPicture-derived classes

dm/DMTileGridTask.cpp

 #include "DMTileGridTask.h"
 #include "DMWriteTask.h"
 #include "DMUtil.h"
 
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 #include "SkTileGridPicture.h"
 
 // TODO(mtklein): Tile grid tests are currently failing.  (Skia issue 1198).  When fixed, -> true.
 DEFINE_bool(tileGrid, false, "If true, run picture replay tests with a tile grid.");
 
 namespace DM {
 
 TileGridTask::TileGridTask(const Task& parent, skiagm::GM* gm, SkBitmap reference, SkISize tileSize)
     : CpuTask(parent)
     , fName(UnderJoin(parent.name().c_str(), "tilegrid"))
     , fGM(gm)
     , fReference(reference)
     , fTileSize(tileSize)
     {}
 
 static int tiles_needed(int fullDimension, int tileDimension) {
     return (fullDimension + tileDimension - 1) / tileDimension;
 }
 
 void TileGridTask::draw() {
-    const SkTileGridPicture::TileGridInfo info = {
+    const SkTileGridFactory::TileGridInfo info = {
         fTileSize,
-        SkISize::Make(0,0),   // Overlap between adjacent tiles.
-        SkIPoint::Make(0,0),  // Offset.
+        SkISize::Make(0,0),    // Overlap between adjacent tiles.
+        SkIPoint::Make(0,0),   // Offset.
     };
-    SkAutoTUnref<SkPictureFactory> factory(SkNEW_ARGS(SkTileGridPictureFactory, (info)));
+    SkTileGridFactory factory(info);
     SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get(),
                                                    SkPicture::kUsePathBoundsForClip_RecordingFlag,
-                                                   factory));
+                                                   &factory));
 
     SkBitmap full;
     SetupBitmap(fReference.colorType(), fGM.get(), &full);
     SkCanvas fullCanvas(full);
 
     SkBitmap tile;
     tile.allocPixels(SkImageInfo::Make(fTileSize.width(), fTileSize.height(),
                                        fReference.colorType(), kPremul_SkAlphaType));
     SkCanvas tileCanvas(tile);
 
@@ skipping 26 matching lines @@
     if (fGM->getFlags() & skiagm::GM::kSkipPicture_Flag) {
         return true;
     }
     if (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag) {
         return true;
     }
     return !FLAGS_tileGrid;
 }
 
 }  // namespace DM