move methods to options class

Change-Id: I5e4abcec1b9f99997cd68b433490e13eaa76f3f9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296123
Commit-Queue: Herb Derby <[email protected]>
Reviewed-by: Robert Phillips <[email protected]>

Author: herbderby

src/core/SkGlyphRunPainter.cpp

@@ -153,8 +153,8 @@ void SkGlyphRunListPainter::processGlyphRunList(const SkGlyphRunList& glyphRunLi
         const SkFont& runFont = glyphRun.font();
 
 
-        bool useSDFT = GrTextContext::CanDrawAsDistanceFields(
-                runPaint, runFont, drawMatrix, props, contextSupportsDistanceFieldText, options);
+        bool useSDFT = options.canDrawAsDistanceFields(
+                runPaint, runFont, drawMatrix, props, contextSupportsDistanceFieldText);
 
         bool usePaths =
                 useSDFT ? false : SkStrikeSpec::ShouldDrawAsPath(runPaint, runFont, drawMatrix);

src/core/SkStrikeSpec.cpp

@@ -190,16 +190,14 @@ SkStrikeSpec::MakeSDFT(const SkFont& font, const SkPaint& paint,
     SkStrikeSpec storage;
 
     SkPaint dfPaint = GrTextContext::InitDistanceFieldPaint(paint);
-    SkFont dfFont = GrTextContext::InitDistanceFieldFont(
-            font, deviceMatrix, options, &storage.fStrikeToSourceRatio);
+    SkFont dfFont = options.getSDFFont(font, deviceMatrix, &storage.fStrikeToSourceRatio);
 
     // Fake-gamma and subpixel antialiasing are applied in the shader, so we ignore the
     // passed-in scaler context flags. (It's only used when we fall-back to bitmap text).
     SkScalerContextFlags flags = SkScalerContextFlags::kNone;
 
     SkScalar minScale, maxScale;
-    std::tie(minScale, maxScale) = GrTextContext::InitDistanceFieldMinMaxScale(
-            font.getSize(), deviceMatrix, options);
+    std::tie(minScale, maxScale) = options.computeSDFMinMaxScale(font.getSize(), deviceMatrix);
 
     storage.commonSetup(dfFont, dfPaint, surfaceProps, flags, SkMatrix::I());
 

src/gpu/text/GrTextContext.cpp

@@ -42,11 +42,10 @@ std::unique_ptr<GrTextContext> GrTextContext::Make(const Options& options) {
     return std::unique_ptr<GrTextContext>(new GrTextContext(options));
 }
 
-bool GrTextContext::CanDrawAsDistanceFields(const SkPaint& paint, const SkFont& font,
-                                            const SkMatrix& viewMatrix,
-                                            const SkSurfaceProps& props,
-                                            bool contextSupportsDistanceFieldText,
-                                            const Options& options) {
+bool GrTextContext::Options::canDrawAsDistanceFields(const SkPaint& paint, const SkFont& font,
+                                                     const SkMatrix& viewMatrix,
+                                                     const SkSurfaceProps& props,
+                                                     bool contextSupportsDistanceFieldText) const {
     // mask filters modify alpha, which doesn't translate well to distance
     if (paint.getMaskFilter() || !contextSupportsDistanceFieldText) {
         return false;
@@ -65,8 +64,8 @@ bool GrTextContext::CanDrawAsDistanceFields(const SkPaint& paint, const SkFont&
         SkScalar scaledTextSize = maxScale * font.getSize();
         // Hinted text looks far better at small resolutions
         // Scaling up beyond 2x yields undesirable artifacts
-        if (scaledTextSize < options.fMinDistanceFieldFontSize ||
-            scaledTextSize > options.fMaxDistanceFieldFontSize) {
+        if (scaledTextSize < fMinDistanceFieldFontSize ||
+            scaledTextSize > fMaxDistanceFieldFontSize) {
             return false;
         }
 
@@ -103,10 +102,9 @@ SkScalar scaled_text_size(const SkScalar textSize, const SkMatrix& viewMatrix) {
     return scaledTextSize;
 }
 
-SkFont GrTextContext::InitDistanceFieldFont(const SkFont& font,
-                                            const SkMatrix& viewMatrix,
-                                            const Options& options,
-                                            SkScalar* textRatio) {
+SkFont GrTextContext::Options::getSDFFont(const SkFont& font,
+                                          const SkMatrix& viewMatrix,
+                                          SkScalar* textRatio) const {
     SkScalar textSize = font.getSize();
     SkScalar scaledTextSize = scaled_text_size(textSize, viewMatrix);
 
@@ -142,10 +140,8 @@ SkFont GrTextContext::InitDistanceFieldFont(const SkFont& font,
     return dfFont;
 }
 
-std::pair<SkScalar, SkScalar> GrTextContext::InitDistanceFieldMinMaxScale(
-        SkScalar textSize,
-        const SkMatrix& viewMatrix,
-        const GrTextContext::Options& options) {
+std::pair<SkScalar, SkScalar> GrTextContext::Options::computeSDFMinMaxScale(
+        SkScalar textSize, const SkMatrix& viewMatrix) const {
 
     SkScalar scaledTextSize = scaled_text_size(textSize, viewMatrix);
 
@@ -154,14 +150,14 @@ std::pair<SkScalar, SkScalar> GrTextContext::InitDistanceFieldMinMaxScale(
     SkScalar dfMaskScaleFloor;
     SkScalar dfMaskScaleCeil;
     if (scaledTextSize <= kSmallDFFontLimit) {
-        dfMaskScaleFloor = options.fMinDistanceFieldFontSize;
+        dfMaskScaleFloor = fMinDistanceFieldFontSize;
         dfMaskScaleCeil = kSmallDFFontLimit;
     } else if (scaledTextSize <= kMediumDFFontLimit) {
         dfMaskScaleFloor = kSmallDFFontLimit;
         dfMaskScaleCeil = kMediumDFFontLimit;
     } else {
         dfMaskScaleFloor = kMediumDFFontLimit;
-        dfMaskScaleCeil = options.fMaxDistanceFieldFontSize;
+        dfMaskScaleCeil = fMaxDistanceFieldFontSize;
     }
 
     // Because there can be multiple runs in the blob, we want the overall maxMinScale, and

src/gpu/text/GrTextContext.h

@@ -35,6 +35,16 @@ class GrTextContext {
                 , fMaxDistanceFieldFontSize{max} {
             SkASSERT_RELEASE(min > 0 && max >= min);
         }
+
+        bool canDrawAsDistanceFields(const SkPaint&, const SkFont&, const SkMatrix& viewMatrix,
+                                     const SkSurfaceProps& props,
+                                     bool contextSupportsDistanceFieldText) const;
+        SkFont getSDFFont(const SkFont& font,
+                          const SkMatrix& viewMatrix,
+                          SkScalar* textRatio) const;
+        std::pair<SkScalar, SkScalar> computeSDFMinMaxScale(
+                SkScalar textSize, const SkMatrix& viewMatrix) const;
+    private:
         // Below this size (in device space) distance field text will not be used.
         const SkScalar fMinDistanceFieldFontSize;
 
@@ -45,23 +55,8 @@ class GrTextContext {
 
     static std::unique_ptr<GrTextContext> Make(const Options& options);
 
-    static bool CanDrawAsDistanceFields(const SkPaint&, const SkFont&, const SkMatrix& viewMatrix,
-                                        const SkSurfaceProps& props,
-                                        bool contextSupportsDistanceFieldText,
-                                        const Options& options);
-
-    static SkFont InitDistanceFieldFont(const SkFont& font,
-                                        const SkMatrix& viewMatrix,
-                                        const Options& options,
-                                        SkScalar* textRatio);
-
     static SkPaint InitDistanceFieldPaint(const SkPaint& paint);
 
-    static std::pair<SkScalar, SkScalar> InitDistanceFieldMinMaxScale(SkScalar textSize,
-                                                                      const SkMatrix& viewMatrix,
-                                                                      const Options& options);
-    Options options() const { return fOptions; }
-
 private:
     GrTextContext(const Options& options);
 

tests/SkRemoteGlyphCacheTest.cpp

@@ -692,8 +692,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_DrawTextAsDFT, reporter, c
     SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);
     GrTextContext::Options options =
             ctxInfo.grContext()->priv().asRecordingContext()->priv().SDFTOptions();
-    REPORTER_ASSERT(reporter, GrTextContext::CanDrawAsDistanceFields(
-                                      paint, font, matrix, surfaceProps, true, options));
+    REPORTER_ASSERT(reporter,
+            options.canDrawAsDistanceFields(paint, font, matrix, surfaceProps, true));
 
     // Server.
     auto serverTf = SkTypeface::MakeFromName("monospace", SkFontStyle());