Index: src/core/SkTileGrid.h |
diff --git a/src/core/SkTileGrid.h b/src/core/SkTileGrid.h |
index fd7584fd9c6052093243b8be212c3a9ea00822e2..d556f8074b89934fb7ecd1b113148b9504f45f1c 100644 |
--- a/src/core/SkTileGrid.h |
+++ b/src/core/SkTileGrid.h |
@@ -8,6 +8,7 @@ |
#ifndef SkTileGrid_DEFINED |
#define SkTileGrid_DEFINED |
+#include "Sk4x.h" |
#include "SkBBHFactory.h" |
#include "SkBBoxHierarchy.h" |
@@ -43,16 +44,16 @@ public: |
virtual void flushDeferredInserts() SK_OVERRIDE; |
private: |
- void commonAdjust(SkRect*) const; |
- void userToGrid(const SkRect&, SkIRect* grid) const; |
+ void userToGrid(const Sk4f&, SkIRect*) const; |
+ bool intersectsGrid(const Sk4f&) const; |
- const int fXTiles, fYTiles; |
- const SkScalar fInvWidth, fInvHeight; |
- const SkScalar fMarginWidth, fMarginHeight; |
- const SkPoint fOffset; |
- const SkRect fGridBounds; |
+ const int fXTiles, // Number of tiles in a single row. |
+ fNumTiles; // Total number of tiles. |
- // (fXTiles * fYTiles) SkTDArrays, each listing ops overlapping that tile in order. |
+ const SkRect fGridBounds; // Only used for intersectsGrid(). Remove if that's removed. |
+ const Sk4f fMargin, fOffset, fUserToGrid, fGridHigh; |
+ |
+ // fNumTiles SkTDArrays, each listing ops overlapping that tile in order. |
SkTDArray<unsigned>* fTiles; |
typedef SkBBoxHierarchy INHERITED; |