Staged removal of SkPicture-derived classes

src/core/SkTileGrid.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTileGrid_DEFINED
 #define SkTileGrid_DEFINED
@@ skipping 17 matching lines @@
     enum {
         // Number of tiles for which data is allocated on the stack in
         // SkTileGrid::search. If malloc becomes a bottleneck, we may consider
         // increasing this number. Typical large web page, say 2k x 16k, would
         // require 512 tiles of size 256 x 256 pixels.
         kStackAllocationTileCount = 1024
     };
 
     typedef void* (*SkTileGridNextDatumFunctionPtr)(SkTDArray<void*>** tileData, SkAutoSTArray<kStackAllocationTileCount, int>& tileIndices);
 
-    SkTileGrid(int xTileCount, int yTileCount, const SkTileGridPicture::TileGridInfo& info,
+    SkTileGrid(int xTileCount, int yTileCount, const SkTileGridFactory::TileGridInfo& info,
         SkTileGridNextDatumFunctionPtr nextDatumFunction);
 
     virtual ~SkTileGrid();
 
     /**
      * Insert a data pointer and corresponding bounding box
      * @param data The data pointer, may be NULL
      * @param bounds The bounding box, should not be empty
      * @param defer Ignored, TileArray does not defer insertions
      */
@@ skipping 22 matching lines @@
     enum {
         kTileFinished = -1,
     };
 
     int tileCount(int x, int y);  // For testing only.
 
 private:
     SkTDArray<void*>& tile(int x, int y);
 
     int fXTileCount, fYTileCount, fTileCount;
-    SkTileGridPicture::TileGridInfo fInfo;
+    SkTileGridFactory::TileGridInfo fInfo;
     SkTDArray<void*>* fTileData;
     int fInsertionCount;
     SkIRect fGridBounds;
     SkTileGridNextDatumFunctionPtr fNextDatumFunction;
 
     typedef SkBBoxHierarchy INHERITED;
 };
 
 /**
  * Generic implementation for SkTileGridNextDatumFunctionPtr. user code may instantiate
@@ skipping 41 matching lines @@
                     tileIndices[tile] = SkTileGrid::kTileFinished;
                 }
             }
         }
         return minVal;
     }
     return NULL;
 }
 
 #endif