| Index: src/core/SkTileGrid.h
|
| diff --git a/src/core/SkTileGrid.h b/src/core/SkTileGrid.h
|
| index fd7584fd9c6052093243b8be212c3a9ea00822e2..99218c77bed2c365e101890c34fc5d4efb6242e6 100644
|
| --- a/src/core/SkTileGrid.h
|
| +++ b/src/core/SkTileGrid.h
|
| @@ -19,30 +19,18 @@
|
| class SkTileGrid : public SkBBoxHierarchy {
|
| public:
|
| SkTileGrid(int xTiles, int yTiles, const SkTileGridFactory::TileGridInfo& info);
|
| -
|
| virtual ~SkTileGrid();
|
|
|
| - /**
|
| - * Insert a opIndex value and corresponding bounding box
|
| - * @param opIndex
|
| - * @param bounds The bounding box, should not be empty.
|
| - * @param defer Ignored; SkTileGrid does not defer insertions.
|
| - */
|
| - virtual void insert(unsigned opIndex, const SkRect& bounds, bool) SK_OVERRIDE;
|
| -
|
| - /**
|
| - * Populate 'results' with opIndexes corresponding to bounding boxes that intersect 'query'.
|
| - * This will be fastest if the query is an exact match to a single grid tile.
|
| - */
|
| + virtual void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE;
|
| virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE;
|
|
|
| // For testing.
|
| int tileCount(int x, int y) { return fTiles[y * fXTiles + x].count(); }
|
|
|
| - virtual void reserve(unsigned opCount) SK_OVERRIDE;
|
| - virtual void flushDeferredInserts() SK_OVERRIDE;
|
| -
|
| private:
|
| + void reserve(int);
|
| + void shrinkToFit();
|
| +
|
| void commonAdjust(SkRect*) const;
|
| void userToGrid(const SkRect&, SkIRect* grid) const;
|
|
|
|
|