1 files changed, 13 insertions, 11 deletions
diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h
index 1342ee7ac8..e2531b3d59 100644
--- a/src/gpu/text/GrAtlasTextContext.h
+++ b/src/gpu/text/GrAtlasTextContext.h
@@ -60,6 +60,18 @@ public:
                                                    const SkMatrix& viewMatrix, const char* text,
                                                    int x, int y);
 
+    static void SanitizeOptions(Options* options);
+    static bool CanDrawAsDistanceFields(const SkPaint& skPaint, const SkMatrix& viewMatrix,
+                                        const SkSurfaceProps& props,
+                                        bool contextSupportsDistanceFieldText,
+                                        const Options& options);
+    static void InitDistanceFieldPaint(GrAtlasTextBlob* blob,
+                                       SkPaint* skPaint,
+                                       const SkMatrix& viewMatrix,
+                                       const Options& options,
+                                       SkScalar* textRatio,
+                                       SkScalerContextFlags* flags);
+
 private:
     GrAtlasTextContext(const Options& options);
 
@@ -158,9 +170,6 @@ private:
                                       const SkPoint& offset);
 
     // functions for appending distance field text
-    bool canDrawAsDistanceFields(const SkPaint& skPaint, const SkMatrix& viewMatrix,
-                                 const SkSurfaceProps& props, const GrShaderCaps& caps) const;
-
     void drawDFText(GrAtlasTextBlob* blob, int runIndex, GrGlyphCache*, const SkSurfaceProps&,
                     const GrTextUtils::Paint& paint, SkScalerContextFlags scalerContextFlags,
                     const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x,
@@ -173,11 +182,6 @@ private:
                        size_t byteLength, const SkScalar pos[], int scalarsPerPosition,
                        const SkPoint& offset) const;
 
-    void initDistanceFieldPaint(GrAtlasTextBlob* blob,
-                                SkPaint* skPaint,
-                                SkScalar* textRatio,
-                                const SkMatrix& viewMatrix) const;
-
     static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrGlyphCache*,
                                sk_sp<GrTextStrike>*, const SkGlyph&, SkScalar sx, SkScalar sy,
                                GrColor color, SkGlyphCache*, SkScalar textRatio);
@@ -190,9 +194,7 @@ private:
 
     sk_sp<const GrDistanceFieldAdjustTable> fDistanceAdjustTable;
 
-    SkScalar fMinDistanceFieldFontSize;
-    SkScalar fMaxDistanceFieldFontSize;
-    bool fDistanceFieldVerticesAlwaysHaveW;
+    Options fOptions;
 
 #if GR_TEST_UTILS
     static const SkScalerContextFlags kTextBlobOpScalerContextFlags =