Move distance field font code into SkGpuDevice

include/core/SkDraw.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkDraw_DEFINED
@@ skipping 89 matching lines @@
      *  Based on the paint's style, strokeWidth, and the matrix, classify how
      *  to draw the rect. If no special-case is available, returns
      *  kPath_RectType.
      *
      *  Iff RectType == kStroke_RectType, then strokeSize is set to the device
      *  width and height of the stroke.
      */
     static RectType ComputeRectType(const SkPaint&, const SkMatrix&,
                                     SkPoint* strokeSize);
 
-    void    drawText_asPaths(const char text[], size_t byteLength,
-                             SkScalar x, SkScalar y, const SkPaint&) const;
-    void    drawPosText_asPaths(const char text[], size_t byteLength,
-                                const SkScalar pos[], SkScalar constY,
-                                int scalarsPerPosition, const SkPaint&) const;
+    static bool ShouldDrawTextAsPaths(const SkPaint&, const SkMatrix&);
+    void        drawText_asPaths(const char text[], size_t byteLength,
+                                 SkScalar x, SkScalar y, const SkPaint&) const;
+    void        drawPosText_asPaths(const char text[], size_t byteLength,
+                                    const SkScalar pos[], SkScalar constY,
+                                    int scalarsPerPosition, const SkPaint&) const;
 
 private:
     void    drawDevMask(const SkMask& mask, const SkPaint&) const;
     void    drawBitmapAsMask(const SkBitmap&, const SkPaint&) const;
 
     void    drawPath(const SkPath&, const SkPaint&, const SkMatrix* preMatrix,
                      bool pathIsMutable, bool drawCoverage) const;
 
     /**
      *  Return the current clip bounds, in local coordinates, with slop to account
      *  for antialiasing or hairlines (i.e. device-bounds outset by 1, and then
      *  run through the inverse of the matrix).
      *
      *  If the matrix cannot be inverted, or the current clip is empty, return
      *  false and ignore bounds parameter.
      */
     bool SK_WARN_UNUSED_RESULT
     computeConservativeLocalClipBounds(SkRect* bounds) const;
 
-    static bool ShouldDrawTextAsPaths(const SkPaint&, const SkMatrix&);
-
 public:
     const SkBitmap* fBitmap;        // required
     const SkMatrix* fMatrix;        // required
     const SkRegion* fClip;          // DEPRECATED
     const SkRasterClip* fRC;        // required
 
     const SkClipStack* fClipStack;  // optional
     SkBaseDevice*   fDevice;        // optional
     SkBounder*      fBounder;       // optional
     SkDrawProcs*    fProcs;         // optional
 
 #ifdef SK_DEBUG
     void validate() const;
 #else
     void validate() const {}
 #endif
 };
 
 #endif