Revert of Make draw* lines responsible for cache management

src/gpu/text/GrTextUtils.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 GrTextUtils_DEFINED
 #define GrTextUtils_DEFINED
 
@@ skipping 17 matching lines @@
 
 /*
  * A class to house a bunch of common text utilities.  This class should *ONLY* have static
  * functions.  It is not a namespace only because we wish to friend SkPaint
  *
  */
 class GrTextUtils {
 public:
     // Functions for appending BMP text to GrAtlasTextBlob
     static void DrawBmpText(GrAtlasTextBlob*, int runIndex,
-                            GrBatchFontCache*, const SkSurfaceProps&,
-                            const SkPaint&,
+                            GrBatchFontCache*, SkGlyphCache*, const SkPaint&,
                             GrColor, const SkMatrix& viewMatrix,
                             const char text[], size_t byteLength,
                             SkScalar x, SkScalar y);
 
     static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex,
-                               GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&,
+                               GrBatchFontCache*, SkGlyphCache*, const SkPaint&,
                                GrColor, const SkMatrix& viewMatrix,
                                const char text[], size_t byteLength,
                                const SkScalar pos[], int scalarsPerPosition,
                                const SkPoint& offset);
 
     // Functions for drawing text as paths
     static void DrawTextAsPath(GrContext*, GrDrawContext*, const GrClip& clip,
                                const SkPaint& origPaint, const SkMatrix& viewMatrix,
                                const char text[], size_t byteLength, SkScalar x, SkScalar y,
                                const SkIRect& clipBounds);
 
     static void DrawPosTextAsPath(GrContext* context,
                                   GrDrawContext* dc,
                                   const SkSurfaceProps& props,
                                   const GrClip& clip,
                                   const SkPaint& origPaint, const SkMatrix& viewMatrix,
                                   const char text[], size_t byteLength,
                                   const SkScalar pos[], int scalarsPerPosition,
                                   const SkPoint& offset, const SkIRect& clipBounds);
 private:
     static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
                                GrBatchTextStrike**, const SkGlyph&, int left, int top,
                                GrColor color, GrFontScaler*);
 };
 
 #endif