Staged removal of SkPicture-derived classes

tests/TileGridTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkTileGrid.h"
@@ skipping 16 matching lines @@
     virtual void drawRect(const SkRect& rect, const SkPaint&) {
         // This capture occurs before quick reject.
         fRects.push(rect);
     }
 
     SkTDArray<SkRect> fRects;
 };
 
 static void verifyTileHits(skiatest::Reporter* reporter, SkIRect rect,
                            uint32_t tileMask, int borderPixels = 0) {
-    SkTileGridPicture::TileGridInfo info;
+    SkTileGridFactory::TileGridInfo info;
     info.fMargin.set(borderPixels, borderPixels);
     info.fOffset.setZero();
     info.fTileInterval.set(10 - 2 * borderPixels, 10 - 2 * borderPixels);
     SkTileGrid grid(2, 2, info, NULL);
     grid.insert(NULL, rect, false);
     REPORTER_ASSERT(reporter, grid.tileCount(0, 0) ==
                     ((tileMask & kTopLeft_Tile)? 1 : 0));
     REPORTER_ASSERT(reporter, grid.tileCount(1, 0) ==
                     ((tileMask & kTopRight_Tile)? 1 : 0));
     REPORTER_ASSERT(reporter, grid.tileCount(0, 1) ==
                     ((tileMask & kBottomLeft_Tile)? 1 : 0));
     REPORTER_ASSERT(reporter, grid.tileCount(1, 1) ==
                     ((tileMask & kBottomRight_Tile)? 1 : 0));
 }
 
 DEF_TEST(TileGrid_UnalignedQuery, reporter) {
     // Use SkTileGridPicture to generate a SkTileGrid with a helper
-    SkTileGridPicture::TileGridInfo info;
+    SkTileGridFactory::TileGridInfo info;
     info.fMargin.setEmpty();
     info.fOffset.setZero();
     info.fTileInterval.set(10, 10);
     SkRect rect1 = SkRect::MakeXYWH(SkIntToScalar(0), SkIntToScalar(0),
                                     SkIntToScalar(8), SkIntToScalar(8));
     SkRect rect2 = SkRect::MakeXYWH(SkIntToScalar(11), SkIntToScalar(11),
                                     SkIntToScalar(1), SkIntToScalar(1));
-    SkAutoTUnref<SkPictureFactory> factory(SkNEW_ARGS(SkTileGridPictureFactory, (info)));
-    SkPictureRecorder recorder(factory);
-    SkCanvas* canvas = recorder.beginRecording(20, 20);
+    SkTileGridFactory factory(info);
+    SkPictureRecorder recorder;
+    SkCanvas* canvas = recorder.beginRecording(20, 20, &factory, 0);
     SkPaint paint;
     canvas->drawRect(rect1, paint);
     canvas->drawRect(rect2, paint);
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
     SkBitmap store;
     store.allocN32Pixels(1, 1);
 
     // Test parts of top-left tile
     {
@@ skipping 52 matching lines @@
         MockCanvas mockCanvas(store);
         mockCanvas.translate(-16.0f, -22.0f);
         picture->draw(&mockCanvas);
         REPORTER_ASSERT(reporter, 1 == mockCanvas.fRects.count());
         REPORTER_ASSERT(reporter, rect2 == mockCanvas.fRects[0]);
     }
 }
 
 DEF_TEST(TileGrid_OverlapOffsetQueryAlignment, reporter) {
     // Use SkTileGridPicture to generate a SkTileGrid with a helper
-    SkTileGridPicture::TileGridInfo info;
+    SkTileGridFactory::TileGridInfo info;
     info.fMargin.set(1, 1);
     info.fOffset.set(-1, -1);
     info.fTileInterval.set(8, 8);
 
     // rect landing entirely in top left tile
     SkRect rect1 = SkRect::MakeXYWH(SkIntToScalar(0), SkIntToScalar(0),
                                     SkIntToScalar(1), SkIntToScalar(1));
     // rect landing entirely in center tile
     SkRect rect2 = SkRect::MakeXYWH(SkIntToScalar(12), SkIntToScalar(12),
                                     SkIntToScalar(1), SkIntToScalar(1));
     // rect landing entirely in bottomright tile
     SkRect rect3 = SkRect::MakeXYWH(SkIntToScalar(19), SkIntToScalar(19),
                                     SkIntToScalar(1), SkIntToScalar(1));
-    SkAutoTUnref<SkPictureFactory> factory(SkNEW_ARGS(SkTileGridPictureFactory, (info)));
-    SkPictureRecorder recorder(factory);
-    SkCanvas* canvas = recorder.beginRecording(20, 20);
+    SkTileGridFactory factory(info);
+    SkPictureRecorder recorder;
+    SkCanvas* canvas = recorder.beginRecording(20, 20, &factory, 0);
     SkPaint paint;
     canvas->drawRect(rect1, paint);
     canvas->drawRect(rect2, paint);
     canvas->drawRect(rect3, paint);
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
     SkBitmap tileBitmap;
     tileBitmap.allocN32Pixels(10, 10);
     SkBitmap moreThanATileBitmap;
     moreThanATileBitmap.allocN32Pixels(11, 11);
@@ skipping 78 matching lines @@
     verifyTileHits(reporter, SkIRect::MakeXYWH(10, 10, 1, 1),  kBottomRight_Tile, 1);
     verifyTileHits(reporter, SkIRect::MakeXYWH(17, 17, 1, 1),  kBottomRight_Tile, 1);
 
     // BBoxes that overlap tiles
     verifyTileHits(reporter, SkIRect::MakeXYWH(5, 5, 10, 1),  kTopLeft_Tile | kTopRight_Tile);
     verifyTileHits(reporter, SkIRect::MakeXYWH(5, 5, 1, 10),  kTopLeft_Tile |
                    kBottomLeft_Tile);
     verifyTileHits(reporter, SkIRect::MakeXYWH(5, 5, 10, 10),  kAll_Tile);
     verifyTileHits(reporter, SkIRect::MakeXYWH(-10, -10, 40, 40),  kAll_Tile);
 }