Store pointers to GrGlyph directly in BitmapTextBlob

src/gpu/GrAtlasTextContext.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlasTextContext_DEFINED
 #define GrAtlasTextContext_DEFINED
 
 #include "GrTextContext.h"
 
 #include "GrBatchAtlas.h"
+#include "GrBatchFontCache.h"
 #include "GrGeometryProcessor.h"
 #include "SkDescriptor.h"
 #include "GrMemoryPool.h"
 #include "SkMaskFilter.h"
 #include "SkTextBlob.h"
 #include "SkTInternalLList.h"
 
-class GrBatchTextStrike;
 class GrPipelineBuilder;
 class GrTextBlobCache;
 
 /*
  * This class implements GrTextContext using standard bitmap fonts, and can also process textblobs.
  * TODO replace GrBitmapTextContext
  */
 class GrAtlasTextContext : public GrTextContext {
 public:
     static GrAtlasTextContext* Create(GrContext*, SkGpuDevice*, const SkDeviceProperties&,
@@ skipping 133 matching lines @@
                 }
 
             private:
                 static const int kMinSubRuns = 1;
                 static const int kMinSubRunStorage = kMinSubRuns * sizeof(SubRunInfo);
                 SubRunInfo* fPtr;
                 SkAutoSTMalloc<kMinSubRunStorage, unsigned char> fSubRunStorage;
                 int fSubRunCount;
                 int fSubRunAllocation;
             };
+            SkAutoTUnref<GrBatchTextStrike> fStrike;
             SkAutoTUnref<SkTypeface> fTypeface;
             SkRect fVertexBounds;
             SubRunInfoArray fSubRunInfo;
             SkAutoDescriptor fDescriptor;
             GrColor fColor;
             bool fInitialized;
             bool fDrawAsPaths;
         };
 
         struct BigGlyph {
@@ skipping 22 matching lines @@
         };
 
         struct StrokeInfo {
             SkScalar fFrameWidth;
             SkScalar fMiterLimit;
             SkPaint::Join fJoin;
         };
 
         // all glyph / vertex offsets are into these pools.
         unsigned char* fVertices;
-        GrGlyph::PackedID* fGlyphIDs;
+        GrGlyph** fGlyphs;
         Run* fRuns;
         GrMemoryPool* fPool;
         SkMaskFilter::BlurRec fBlurRec;
         StrokeInfo fStrokeInfo;
         SkTArray<BigGlyph> fBigGlyphs;
         Key fKey;
         SkMatrix fViewMatrix;
 #ifdef SK_DEBUG
         mutable SkScalar fTotalXError;
         mutable SkScalar fTotalYError;
@@ skipping 40 matching lines @@
     void bmpAppendGlyph(BitmapTextBlob*, int runIndex, GrGlyph::PackedID, int left, int top,
                         GrColor color, GrFontScaler*, const SkIRect& clipRect);
     bool dfAppendGlyph(BitmapTextBlob*, int runIndex, GrGlyph::PackedID, SkScalar sx, SkScalar sy,
                        GrColor color, GrFontScaler*, const SkIRect& clipRect, SkScalar textRatio,
                        const SkMatrix& viewMatrix);
     inline void appendGlyphPath(BitmapTextBlob* blob, GrGlyph* glyph,
                                 GrFontScaler* scaler, int x, int y);
     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,
                                 SkScalar y);
     inline void flushRun(GrDrawTarget*, GrPipelineBuilder*, BitmapTextBlob*, int run, GrColor,
                          SkScalar transX, SkScalar transY, const SkPaint&);
     inline void flushBigGlyphs(BitmapTextBlob* cacheBlob, GrRenderTarget* rt,
                                const GrPaint& grPaint, const GrClip& clip,
                                SkScalar transX, SkScalar transY);
 
@@ skipping 82 matching lines @@
     bool fEnableDFRendering;
     SkAutoTUnref<DistanceAdjustTable> fDistanceAdjustTable;
 
     friend class GrTextBlobCache;
     friend class BitmapTextBatch;
 
     typedef GrTextContext INHERITED;
 };
 
 #endif