Restore text alloc optimizations.

src/gpu/GrDistanceFieldTextContext.h

Index: src/gpu/GrDistanceFieldTextContext.h
diff --git a/src/gpu/GrDistanceFieldTextContext.h b/src/gpu/GrDistanceFieldTextContext.h
index 75a13b385bd2e9ef714096946224b44b5113f6fc..c9fe82d2e571237ed587de66f3e38b423328ae4f 100644
--- a/src/gpu/GrDistanceFieldTextContext.h
+++ b/src/gpu/GrDistanceFieldTextContext.h
@@ -30,18 +30,8 @@ public:
     virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
 
 private:
-    GrTextStrike*           fStrike;
-    SkScalar                fTextRatio;
-    bool                    fUseLCDText;
-    bool                    fEnableDFRendering;
-    SkAutoTUnref<GrEffect>  fCachedEffect;
-    // Used to check whether fCachedEffect is still valid.
-    uint32_t                fEffectTextureUniqueID;
-    SkColor                 fEffectColor;
-    uint32_t                fEffectFlags;
-    GrTexture*              fGammaTexture;
-
     void init(const GrPaint&, const SkPaint&);
+    void allocateVertices(const char text[], size_t byteLength);
     void drawPackedGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*);
     void flushGlyphs();                 // automatically called by destructor
     void setupCoverageEffect(const SkColor& filteredColor);
@@ -54,9 +44,19 @@ private:
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 

[robertphillips, 2014/08/27 15:45:42]

Fields are supposed to go before methods.

+    GrTextStrike*           fStrike;
+    SkScalar                fTextRatio;
+    bool                    fUseLCDText;
+    bool                    fEnableDFRendering;
+    SkAutoTUnref<GrEffect>  fCachedEffect;
+    // Used to check whether fCachedEffect is still valid.
+    uint32_t                fEffectTextureUniqueID;
+    SkColor                 fEffectColor;
+    uint32_t                fEffectFlags;
+    GrTexture*              fGammaTexture;
+
     void*                   fVertices;
-    int32_t                 fMaxVertices;
-    GrTexture*              fCurrTexture;
+    int                     fVertexCount;
     int                     fCurrVertex;
     SkRect                  fVertexBounds;
 };