| Index: src/core/SkTileGrid.h
|
| diff --git a/src/core/SkTileGrid.h b/src/core/SkTileGrid.h
|
| index fd7584fd9c6052093243b8be212c3a9ea00822e2..3c47aaf3e9305b01481ad9d62cb813eba2349543 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,13 @@ public:
|
| virtual void flushDeferredInserts() SK_OVERRIDE;
|
|
|
| private:
|
| - void commonAdjust(SkRect*) const;
|
| - void userToGrid(const SkRect&, SkIRect* grid) const;
|
| + void userToGrid(const Sk4f&, SkIRect*) const;
|
|
|
| - const int fXTiles, fYTiles;
|
| - const SkScalar fInvWidth, fInvHeight;
|
| - const SkScalar fMarginWidth, fMarginHeight;
|
| - const SkPoint fOffset;
|
| - const SkRect fGridBounds;
|
| + const int fXTiles, fNumTiles;
|
|
|
| - // (fXTiles * fYTiles) SkTDArrays, each listing ops overlapping that tile in order.
|
| + const Sk4f fGridBounds, fMargin, fOffset, fScale, fHigh;
|
| +
|
| + // fNumTiles SkTDArrays, each listing ops overlapping that tile in order.
|
| SkTDArray<unsigned>* fTiles;
|
|
|
| typedef SkBBoxHierarchy INHERITED;
|
|
|