Revert of Restore text alloc optimizations.

src/gpu/GrBitmapTextContext.h

Index: src/gpu/GrBitmapTextContext.h
diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index 24ee7e8cfe7c9da8794fe5c293018404c34af210..6d4ea6d524e255d57e802bbb5c52502c12642625 100644
--- a/src/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
@@ -30,8 +30,9 @@
     virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
 
 private:
+    GrTextStrike*          fStrike;
+
     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 finish();
@@ -43,13 +44,12 @@
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 
-    GrTextStrike*               fStrike;
+    void*                       fVertices;
+    int32_t                     fMaxVertices;
+    GrTexture*                  fCurrTexture;
     SkAutoTUnref<GrEffect>      fCachedEffect;
     // Used to check whether fCachedEffect is still valid.
     uint32_t                    fEffectTextureUniqueID;
-
-    void*                       fVertices;
-    int                         fVertexCount;
     int                         fCurrVertex;
     SkRect                      fVertexBounds;
 };