make internaldrawBmpText part of GrTextUtils

src/gpu/GrTextUtils.h

Index: src/gpu/GrTextUtils.h
diff --git a/src/gpu/GrTextUtils.h b/src/gpu/GrTextUtils.h
index cd2067f4645eea2a5e3b86756f1d4a272659cdfc..8f673afbed6c699524794ea169c7aeb60b823c3e 100644
--- a/src/gpu/GrTextUtils.h
+++ b/src/gpu/GrTextUtils.h
@@ -8,15 +8,22 @@
 #ifndef GrTextUtils_DEFINED
 #define GrTextUtils_DEFINED
 
+#include "GrColor.h"
 #include "SkScalar.h"
 
+class GrAtlasTextBlob;
+class GrBatchFontCache;
+class GrBatchTextStrike;
 class GrClip;
 class GrContext;
 class GrDrawContext;
+class GrFontScaler;
+class SkGlyph;
 class SkMatrix;
 struct SkIRect;
 class SkPaint;
 struct SkPoint;
+class SkGlyphCache;
 class SkSurfaceProps;
 
 /*
@@ -26,20 +33,38 @@ class SkSurfaceProps;
  */
 class GrTextUtils {
 public:
+    // Functions for appending BMP text to GrAtlasTextBlob
+    static void DrawBmpText(GrAtlasTextBlob*, int runIndex,
+                            GrBatchFontCache*, SkGlyphCache*, const SkPaint&,
+                            GrColor, const SkMatrix& viewMatrix,
+                            const char text[], size_t byteLength,
+                            SkScalar x, SkScalar y);
 
-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);
+    static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex,
+                               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