Move distance field text positioning into GrTextUtils

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
 
 #include "GrColor.h"
 #include "SkScalar.h"
 
 class GrAtlasTextBlob;
 class GrBatchFontCache;
 class GrBatchTextStrike;
 class GrClip;
 class GrContext;
 class GrDrawContext;
 class GrFontScaler;
+class GrShaderCaps;
 class SkGlyph;
 class SkMatrix;
 struct SkIRect;
 class SkPaint;
 struct SkPoint;
 class SkGlyphCache;
 class SkSurfaceProps;
 
 /*
  * A class to house a bunch of common text utilities.  This class should *ONLY* have static
@@ skipping 10 matching lines @@
                             const char text[], size_t byteLength,
                             SkScalar x, SkScalar y);
 
     static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex,
                                GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&,
                                GrColor, const SkMatrix& viewMatrix,
                                const char text[], size_t byteLength,
                                const SkScalar pos[], int scalarsPerPosition,
                                const SkPoint& offset);
 
+    // functions for appending distance field text
+    static bool CanDrawAsDistanceFields(const SkPaint& skPaint, const SkMatrix& viewMatrix,
+                                        const SkSurfaceProps& props, const GrShaderCaps& caps);
+
+    static void DrawDfText(GrAtlasTextBlob* blob, int runIndex,

[jvanverth1, 2016/01/19 17:32:46]

This doesn't strike me as the correct camel case: DF is an abbreviation. It was
drawDFText before. 

+                           GrBatchFontCache*, const SkSurfaceProps&,
+                           const SkPaint& skPaint, GrColor color,
+                           const SkMatrix& viewMatrix,
+                           const char text[], size_t byteLength,
+                           SkScalar x, SkScalar y);
+
+    static void DrawDfPosText(GrAtlasTextBlob* blob, int runIndex,
+                              GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&,
+                              GrColor color, 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 InitDistanceFieldPaint(GrAtlasTextBlob* blob,
+                                       SkPaint* skPaint,
+                                       SkScalar* textRatio,
+                                       const SkMatrix& viewMatrix);
+
     static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
                                GrBatchTextStrike**, const SkGlyph&, int left, int top,
                                GrColor color, GrFontScaler*);
+
+    static bool DfAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
+                              GrBatchTextStrike**, const SkGlyph&,
+                              SkScalar sx, SkScalar sy, GrColor color,
+                              GrFontScaler* scaler,
+                              SkScalar textRatio, const SkMatrix& viewMatrix);
 };
 
 #endif