Store pointers to GrGlyph directly in BitmapTextBlob

src/gpu/GrAtlasTextContext.h

Index: src/gpu/GrAtlasTextContext.h
diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/GrAtlasTextContext.h
index 510ab7f05b69420f2c0717094f0596582b0e1a40..a30c465303247ae98cf1ad149d33ec5f2d34220a 100644
--- a/src/gpu/GrAtlasTextContext.h
+++ b/src/gpu/GrAtlasTextContext.h
@@ -11,6 +11,7 @@
 #include "GrTextContext.h"
 
 #include "GrBatchAtlas.h"
+#include "GrBatchFontCache.h"
 #include "GrGeometryProcessor.h"
 #include "SkDescriptor.h"
 #include "GrMemoryPool.h"
@@ -18,7 +19,6 @@
 #include "SkTextBlob.h"
 #include "SkTInternalLList.h"
 
-class GrBatchTextStrike;
 class GrPipelineBuilder;
 class GrTextBlobCache;
 
@@ -172,6 +172,7 @@ private:
                 int fSubRunCount;
                 int fSubRunAllocation;
             };
+            SkAutoTUnref<GrBatchTextStrike> fStrike;
             SkAutoTUnref<SkTypeface> fTypeface;
             SkRect fVertexBounds;
             SubRunInfoArray fSubRunInfo;
@@ -214,7 +215,7 @@ private:
 
         // all glyph / vertex offsets are into these pools.
         unsigned char* fVertices;
-        GrGlyph::PackedID* fGlyphIDs;
+        GrGlyph** fGlyphs;
         Run* fRuns;
         GrMemoryPool* fPool;
         SkMaskFilter::BlurRec fBlurRec;
@@ -275,7 +276,7 @@ private:
     inline void appendGlyphCommon(BitmapTextBlob*, Run*, Run::SubRunInfo*,
                                   const SkRect& positions, GrColor color,
                                   size_t vertexStride, bool useVertexColor,
-                                  GrGlyph::PackedID);
+                                  GrGlyph*);
 
     inline void flushRunAsPaths(const SkTextBlob::RunIterator&, const SkPaint&, SkDrawFilter*,
                                 const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x,