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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/GrGlyph.h

Issue 1011403004: BitmapTextBatch and BitmapTextBlob (Closed) Base URL: https://skia.googlesource.com/skia.git@dfpr_take_2
Patch Set: feedback inc Created 5 years, 9 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
« src/gpu/GrBitmapTextContext.cpp ('K') | « src/gpu/GrFontAtlasSizes.h ('k') | src/gpu/GrStencilAndCoverTextContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrGlyph.h
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h
index 108f2f0fe7d5df231a8337da7090d0d72f553a7e..468155eb79466e7989dcf3b02a0e475674bf0967 100644
--- a/src/gpu/GrGlyph.h
+++ b/src/gpu/GrGlyph.h
@@ -8,6 +8,7 @@
#ifndef GrGlyph_DEFINED
#define GrGlyph_DEFINED
+#include "GrBatchAtlas.h"
#include "GrRect.h"
#include "GrTypes.h"
@@ -30,6 +31,8 @@ struct GrGlyph {
typedef uint32_t PackedID;
+ // TODO either plot or AtlasID will be valid, not both
bsalomon 2015/03/24 16:27:53 Is this b/c we have both batch and nonbatch impls
joshualitt 2015/03/25 14:13:37 yes
+ GrBatchAtlas::AtlasID fID;
GrPlot* fPlot;
SkPath* fPath;
PackedID fPackedID;
@@ -38,6 +41,7 @@ struct GrGlyph {
SkIPoint16 fAtlasLocation;
void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) {
+ fID = GrBatchAtlas::kInvalidAtlasID;
fPlot = NULL;
fPath = NULL;
fPackedID = packed;
« src/gpu/GrBitmapTextContext.cpp ('K') | « src/gpu/GrFontAtlasSizes.h ('k') | src/gpu/GrStencilAndCoverTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698