Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

Unified Diff: src/core/SkTileGrid.h

Issue 637863005: Revert of Start to vectorize SkTileGrid. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/Sk4x_portable.h ('k') | src/core/SkTileGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkTileGrid.h
diff --git a/src/core/SkTileGrid.h b/src/core/SkTileGrid.h
index d556f8074b89934fb7ecd1b113148b9504f45f1c..fd7584fd9c6052093243b8be212c3a9ea00822e2 100644
--- a/src/core/SkTileGrid.h
+++ b/src/core/SkTileGrid.h
@@ -8,7 +8,6 @@
#ifndef SkTileGrid_DEFINED
#define SkTileGrid_DEFINED
-#include "Sk4x.h"
#include "SkBBHFactory.h"
#include "SkBBoxHierarchy.h"
@@ -44,16 +43,16 @@
virtual void flushDeferredInserts() SK_OVERRIDE;
private:
- void userToGrid(const Sk4f&, SkIRect*) const;
- bool intersectsGrid(const Sk4f&) const;
+ void commonAdjust(SkRect*) const;
+ void userToGrid(const SkRect&, SkIRect* grid) const;
- const int fXTiles, // Number of tiles in a single row.
- fNumTiles; // Total number of tiles.
+ const int fXTiles, fYTiles;
+ const SkScalar fInvWidth, fInvHeight;
+ const SkScalar fMarginWidth, fMarginHeight;
+ const SkPoint fOffset;
+ const SkRect fGridBounds;
- 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.
+ // (fXTiles * fYTiles) SkTDArrays, each listing ops overlapping that tile in order.
SkTDArray<unsigned>* fTiles;
typedef SkBBoxHierarchy INHERITED;
« no previous file with comments | « src/core/Sk4x_portable.h ('k') | src/core/SkTileGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698