Revert Jim's CL.

src/gpu/GrBitmapTextContext.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBitmapTextContext_DEFINED
 #define GrBitmapTextContext_DEFINED
 
@@ skipping 12 matching lines @@
     virtual void drawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
                           SkScalar x, SkScalar y) SK_OVERRIDE;
     virtual void drawPosText(const GrPaint&, const SkPaint&,
                              const char text[], size_t byteLength,
                              const SkScalar pos[], SkScalar constY,
                              int scalarsPerPosition) SK_OVERRIDE;
 
     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();
 
     enum {
         kMinRequestedGlyphs      = 1,
         kDefaultRequestedGlyphs  = 64,
         kMinRequestedVerts       = kMinRequestedGlyphs * 4,
         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;
 };
 
 #endif