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

Unified Diff: src/gpu/batches/GrAtlasTextBatch.h

Issue 1512823004: Move DistanceAdjustTable to its own file (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanuptext7
Patch Set: tweaks Created 5 years 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/gpu/GrDistanceFieldAdjustTable.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/batches/GrAtlasTextBatch.h
diff --git a/src/gpu/batches/GrAtlasTextBatch.h b/src/gpu/batches/GrAtlasTextBatch.h
index 5fd3d6110fe3b6283d7317919cd874a27e91be35..edbe3d7813a3c0d7fddacebdc6f7d70e56d92c03 100644
--- a/src/gpu/batches/GrAtlasTextBatch.h
+++ b/src/gpu/batches/GrAtlasTextBatch.h
@@ -11,6 +11,7 @@
#include "batches/GrVertexBatch.h"
#include "GrAtlasTextContext.h"
+#include "GrDistanceFieldAdjustTable.h"
class GrAtlasTextBatch : public GrVertexBatch {
public:
@@ -19,7 +20,6 @@ public:
static const int kVerticesPerGlyph = GrAtlasTextBlob::kVerticesPerGlyph;
static const int kIndicesPerGlyph = 6;
- typedef GrAtlasTextContext::DistanceAdjustTable DistanceAdjustTable;
typedef GrAtlasTextBlob Blob;
typedef Blob::Run Run;
typedef Run::SubRunInfo TextInfo;
@@ -56,10 +56,11 @@ public:
return batch;
}
- static GrAtlasTextBatch* CreateDistanceField(int glyphCount, GrBatchFontCache* fontCache,
- const DistanceAdjustTable* distanceAdjustTable,
- SkColor filteredColor, bool isLCD,
- bool useBGR) {
+ static GrAtlasTextBatch* CreateDistanceField(
+ int glyphCount, GrBatchFontCache* fontCache,
+ const GrDistanceFieldAdjustTable* distanceAdjustTable,
+ SkColor filteredColor, bool isLCD,
+ bool useBGR) {
GrAtlasTextBatch* batch = new GrAtlasTextBatch;
batch->fFontCache = fontCache;
@@ -196,7 +197,7 @@ private:
GrBatchFontCache* fFontCache;
// Distance field properties
- SkAutoTUnref<const DistanceAdjustTable> fDistanceAdjustTable;
+ SkAutoTUnref<const GrDistanceFieldAdjustTable> fDistanceAdjustTable;
SkColor fFilteredColor;
typedef GrVertexBatch INHERITED;
« no previous file with comments | « src/gpu/GrDistanceFieldAdjustTable.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698