diff options
| author |  joshualitt <joshualitt@google.com> | 2015-03-31 11:33:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-31 11:33:08 -0700 |
| commit | c03391e792a55219ddcb033475dc6b80e6a3e2f9 (patch) | |
| tree | 5671404cac5d89d58cf29fa961d65a357b791149 /src/gpu/GrBatchAtlas.h | |
| parent | eed1dae04932483579b02c10f0706127d3f5d984 (diff) | |
Revert of BitmapTextBatch and BitmapTextBlob (patchset #18 id:360001 of https://codereview.chromium.org/1011403004/)
Reason for revert:
Breaks a unit test on mac
Original issue's description:
> BitmapTextBatch and BitmapTextBlob
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/eed1dae04932483579b02c10f0706127d3f5d984
TBR=fmalita@chromium.org,reed@google.com,jvanverth@google.com,robertphillips@google.com,bsalomon@google.com,jvanverth@chromium.org,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1050633002
Diffstat (limited to 'src/gpu/GrBatchAtlas.h')
| -rw-r--r-- | src/gpu/GrBatchAtlas.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gpu/GrBatchAtlas.h b/src/gpu/GrBatchAtlas.h index cd8123f140..b514b9d74f 100644 --- a/src/gpu/GrBatchAtlas.h +++ b/src/gpu/GrBatchAtlas.h @@ -25,8 +25,6 @@ public: // An AtlasID is an opaque handle which callers can use to determine if the atlas contains // a specific piece of data typedef uint32_t AtlasID; - static const uint32_t kInvalidAtlasID = 0; - static const uint64_t kInvalidAtlasGeneration = 0; // A function pointer for use as a callback during eviction. Whenever GrBatchAtlas evicts a // specific AtlasID, it will call all of the registered listeners so they can optionally process @@ -45,7 +43,6 @@ public: GrTexture* getTexture() const { return fTexture; } - uint64_t atlasGeneration() const { return fAtlasGeneration; } bool hasID(AtlasID id); void setLastRefToken(AtlasID id, BatchToken batchToken); void registerEvictionCallback(EvictionFunc func, void* userData) { @@ -75,7 +72,6 @@ private: int fPlotWidth; int fPlotHeight; size_t fBPP; - uint64_t fAtlasGeneration; struct EvictionData { EvictionFunc fFunc; |