GrTextContext::Options -> GrSDFTOptions

herbderby · Skia Commit-Bot · commit a08bde606acb · 2020-06-15T17:14:04.000Z
Rename GrTextContext::Options to GrSDFTOptions. Remove GrTextContext. TBR=reed@google.com Change-Id: Ic89966cfe630cc6ee757977a6d63ae1da9e39ef0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296176 Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/bench/CoverageBench.cpp b/bench/CoverageBench.cpp
@@ -13,6 +13,7 @@
 #include "include/core/SkPath.h"
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkDraw.h"
+#include "src/core/SkMatrixProvider.h"
 #include "src/core/SkRasterClip.h"
 
 class DrawPathBench : public Benchmark {
diff --git a/gn/gpu.gni b/gn/gpu.gni
@@ -465,14 +465,14 @@ skia_gpu_sources = [
   "$_src/gpu/text/GrDistanceFieldAdjustTable.h",
   "$_src/gpu/text/GrSDFMaskFilter.cpp",
   "$_src/gpu/text/GrSDFMaskFilter.h",
+  "$_src/gpu/text/GrSDFTOptions.cpp",
+  "$_src/gpu/text/GrSDFTOptions.h",
   "$_src/gpu/text/GrStrikeCache.cpp",
   "$_src/gpu/text/GrStrikeCache.h",
   "$_src/gpu/text/GrTextBlob.cpp",
   "$_src/gpu/text/GrTextBlob.h",
   "$_src/gpu/text/GrTextBlobCache.cpp",
   "$_src/gpu/text/GrTextBlobCache.h",
-  "$_src/gpu/text/GrTextContext.cpp",
-  "$_src/gpu/text/GrTextContext.h",
   "$_src/gpu/text/GrTextTarget.h",
 
   # GLSL
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
@@ -36,7 +36,6 @@ class GrResourceProvider;
 class GrStrikeCache;
 class GrSurfaceProxy;
 class GrSwizzle;
-class GrTextContext;
 class GrTextureProxy;
 struct GrVkBackendContext;
 
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
@@ -16,8 +16,8 @@
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/ops/GrAtlasTextOp.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 #include "src/gpu/text/GrTextBlobCache.h"
-#include "src/gpu/text/GrTextContext.h"
 #endif
 
 #include "include/core/SkColorFilter.h"
@@ -48,7 +48,7 @@ SkGlyphRunListPainter::SkGlyphRunListPainter(const SkSurfaceProps& props,
         ,  fColorType{colorType}, fScalerContextFlags{flags}
         ,  fStrikeCache{strikeCache} {}
 
-// TODO: unify with code in GrTextContext.cpp
+// TODO: unify with code in GrSDFTOptions.cpp
 static SkScalerContextFlags compute_scaler_context_flags(const SkColorSpace* cs) {
     // If we're doing linear blending, then we can disable the gamma hacks.
     // Otherwise, leave them on. In either case, we still want the contrast boost:
@@ -141,7 +141,7 @@ void SkGlyphRunListPainter::processGlyphRunList(const SkGlyphRunList& glyphRunLi
                                                 const SkMatrix& drawMatrix,
                                                 const SkSurfaceProps& props,
                                                 bool contextSupportsDistanceFieldText,
-                                                const GrTextContext::Options& options,
+                                                const GrSDFTOptions& options,
                                                 SkGlyphRunPainterInterface* process) {
 
     SkPoint origin = glyphRunList.origin();
diff --git a/src/core/SkGlyphRunPainter.h b/src/core/SkGlyphRunPainter.h
@@ -16,7 +16,7 @@
 #include "src/core/SkTextBlobPriv.h"
 
 #if SK_SUPPORT_GPU
-#include "src/gpu/text/GrTextContext.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 class GrColorInfo;
 class GrRenderTargetContext;
 #endif
@@ -87,7 +87,7 @@ class SkGlyphRunListPainter {
                              const SkMatrix& drawMatrix,
                              const SkSurfaceProps& props,
                              bool contextSupportsDistanceFieldText,
-                             const GrTextContext::Options& options,
+                             const GrSDFTOptions& options,
                              SkGlyphRunPainterInterface* process);
 #endif  // SK_SUPPORT_GPU
 
diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
@@ -28,8 +28,9 @@
 #include "src/core/SkZip.h"
 
 #if SK_SUPPORT_GPU
+#include "include/gpu/GrContextOptions.h"
 #include "src/gpu/GrDrawOpAtlas.h"
-#include "src/gpu/text/GrTextContext.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 #endif
 
 static SkDescriptor* auto_descriptor_from_desc(const SkDescriptor* source_desc,
@@ -393,7 +394,7 @@ class SkTextBlobCacheDiffCanvas::TrackLayerDevice final : public SkNoPixelsDevic
     void drawGlyphRunList(const SkGlyphRunList& glyphRunList) override {
         #if SK_SUPPORT_GPU
         GrContextOptions ctxOptions;
-        GrTextContext::Options options =
+        GrSDFTOptions options =
                 {ctxOptions.fMinDistanceFieldFontSize, ctxOptions.fGlyphsAsPathsFontSize};
 
     #ifdef SK_CAPTURE_DRAW_TEXT_BLOB
diff --git a/src/core/SkStrikeSpec.cpp b/src/core/SkStrikeSpec.cpp
@@ -14,8 +14,9 @@
 #include "src/core/SkTLazy.h"
 
 #if SK_SUPPORT_GPU
+#include "src/gpu/text/GrSDFMaskFilter.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 #include "src/gpu/text/GrStrikeCache.h"
-#include "src/gpu/text/GrTextContext.h"
 #endif
 
 SkStrikeSpec SkStrikeSpec::MakeMask(const SkFont& font, const SkPaint& paint,
@@ -186,10 +187,11 @@ SkStrikeSpec SkStrikeSpec::MakePDFVector(const SkTypeface& typeface, int* size)
 std::tuple<SkStrikeSpec, SkScalar, SkScalar>
 SkStrikeSpec::MakeSDFT(const SkFont& font, const SkPaint& paint,
                        const SkSurfaceProps& surfaceProps, const SkMatrix& deviceMatrix,
-                       const GrTextContext::Options& options) {
+                       const GrSDFTOptions& options) {
     SkStrikeSpec storage;
 
-    SkPaint dfPaint = GrTextContext::InitDistanceFieldPaint(paint);
+    SkPaint dfPaint{paint};
+    dfPaint.setMaskFilter(GrSDFMaskFilter::Make());
     SkFont dfFont = options.getSDFFont(font, deviceMatrix, &storage.fStrikeToSourceRatio);
 
     // Fake-gamma and subpixel antialiasing are applied in the shader, so we ignore the
diff --git a/src/core/SkStrikeSpec.h b/src/core/SkStrikeSpec.h
@@ -13,7 +13,7 @@
 #include "src/core/SkStrikeForGPU.h"
 
 #if SK_SUPPORT_GPU
-#include "src/gpu/text/GrTextContext.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 class GrStrikeCache;
 class GrTextStrike;
 #endif
@@ -67,7 +67,7 @@ class SkStrikeSpec {
             const SkPaint& paint,
             const SkSurfaceProps& surfaceProps,
             const SkMatrix& deviceMatrix,
-            const GrTextContext::Options& options);
+            const GrSDFTOptions& options);
 
     sk_sp<GrTextStrike> findOrCreateGrStrike(GrStrikeCache* cache) const;
 #endif
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
@@ -30,9 +30,9 @@
 #include "src/gpu/SkGr.h"
 #include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
 #include "src/gpu/effects/GrSkSLFP.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 #include "src/gpu/text/GrStrikeCache.h"
 #include "src/gpu/text/GrTextBlobCache.h"
-#include "src/gpu/text/GrTextContext.h"
 #include "src/image/SkImage_GpuBase.h"
 #include "src/image/SkSurface_Gpu.h"
 #include <atomic>
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
@@ -37,7 +37,7 @@
 #include "src/gpu/GrTransferFromRenderTask.h"
 #include "src/gpu/GrWaitRenderTask.h"
 #include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
-#include "src/gpu/text/GrTextContext.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 #include "src/image/SkSurface_Gpu.h"
 
 GrDrawingManager::RenderTaskDAG::RenderTaskDAG(bool sortRenderTasks)
diff --git a/src/gpu/GrRecordingContextPriv.h b/src/gpu/GrRecordingContextPriv.h
@@ -9,7 +9,7 @@
 #define GrRecordingContextPriv_DEFINED
 
 #include "include/private/GrRecordingContext.h"
-#include "src/gpu/text/GrTextContext.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 
 /** Class that exposes methods to GrRecordingContext that are only intended for use internal to
     Skia. This class is purely a privileged window into GrRecordingContext. It should never have
@@ -103,7 +103,7 @@ class GrRecordingContextPriv {
         return &fContext->fStats;
     }
 
-    GrTextContext::Options SDFTOptions() const {
+    GrSDFTOptions SDFTOptions() const {
         return {this->options().fMinDistanceFieldFontSize, this->options().fGlyphsAsPathsFontSize};
     }
 
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
@@ -70,8 +70,8 @@
 #include "src/gpu/ops/GrStencilPathOp.h"
 #include "src/gpu/ops/GrStrokeRectOp.h"
 #include "src/gpu/ops/GrTextureOp.h"
+#include "src/gpu/text/GrSDFTOptions.h"
 #include "src/gpu/text/GrTextBlobCache.h"
-#include "src/gpu/text/GrTextContext.h"
 #include "src/gpu/text/GrTextTarget.h"
 
 class GrRenderTargetContext::TextTarget : public GrTextTarget {
@@ -485,7 +485,7 @@ void GrRenderTargetContext::drawGlyphRunList(const GrClip* clip,
         return;
     }
 
-    GrTextContext::Options options = fContext->priv().SDFTOptions();
+    GrSDFTOptions options = fContext->priv().SDFTOptions();
     GrTextBlobCache* textBlobCache = fContext->priv().getTextBlobCache();
 
     // Get the first paint to use as the key paint.
diff --git a/src/gpu/GrSWMaskHelper.h b/src/gpu/GrSWMaskHelper.h
@@ -15,6 +15,7 @@
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkDraw.h"
 #include "src/core/SkRasterClip.h"
+#include "src/gpu/GrSurfaceProxyView.h"
 
 class GrShape;
 class GrStyledShape;
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -24,6 +24,10 @@
 #include "src/gpu/text/GrAtlasManager.h"
 #include "src/gpu/text/GrDistanceFieldAdjustTable.h"
 
+#if GR_TEST_UTILS
+#include "src/gpu/GrDrawOpTest.h"
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 GrAtlasTextOp::GrAtlasTextOp(MaskType maskType,
@@ -487,7 +491,6 @@ GrOp::CombineResult GrAtlasTextOp::onCombineIfPossible(GrOp* t, GrRecordingConte
 static const int kDistanceAdjustLumShift = 5;
 
 // TODO trying to figure out why lcd is so whack
-// (see comments in GrTextContext::ComputeCanonicalColor)
 GrGeometryProcessor* GrAtlasTextOp::setupDfProcessor(SkArenaAlloc* arena,
                                                      const GrShaderCaps& caps,
                                                      const GrSurfaceProxyView* views,
@@ -561,7 +564,7 @@ std::unique_ptr<GrDrawOp> GrAtlasTextOp::CreateOpTestingOnly(GrRenderTargetConte
     auto glyphRunList = builder.useGlyphRunList();
 
     const GrRecordingContextPriv& contextPriv = rtc->fContext->priv();
-    GrTextContext::Options SDFOptions = rtc->fContext->priv().SDFTOptions();
+    GrSDFTOptions SDFOptions = rtc->fContext->priv().SDFTOptions();
 
     if (glyphRunList.empty()) {
         return nullptr;
diff --git a/src/gpu/text/GrSDFTOptions.cpp b/src/gpu/text/GrSDFTOptions.cpp
@@ -1,27 +1,19 @@
 /*
- * Copyright 2015 Google Inc.
+ * Copyright 2020 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "src/gpu/text/GrTextContext.h"
-
-#include "include/core/SkGraphics.h"
-#include "include/gpu/GrContext.h"
-#include "include/private/SkTo.h"
-#include "src/core/SkDistanceFieldGen.h"
-#include "src/core/SkDraw.h"
-#include "src/core/SkDrawProcs.h"
-#include "src/core/SkGlyphRun.h"
-#include "src/core/SkMaskFilterBase.h"
-#include "src/core/SkPaintPriv.h"
-#include "src/gpu/GrCaps.h"
-#include "src/gpu/GrRecordingContextPriv.h"
-#include "src/gpu/SkGr.h"
-#include "src/gpu/ops/GrMeshDrawOp.h"
-#include "src/gpu/text/GrSDFMaskFilter.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrSDFTOptions.h"
+
+#include "include/core/SkFont.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSurfaceProps.h"
+
+#include <tuple>
 
 // DF sizes and thresholds for usage of the small and medium sizes. For example, above
 // kSmallDFFontLimit we will use the medium size. The large size is used up until the size at
@@ -36,16 +28,16 @@ static const int kLargeDFFontLimit = 162;
 static const int kExtraLargeDFFontSize = 256;
 #endif
 
-GrTextContext::GrTextContext(const Options& options) : fOptions(options) { }
-
-std::unique_ptr<GrTextContext> GrTextContext::Make(const Options& options) {
-    return std::unique_ptr<GrTextContext>(new GrTextContext(options));
+GrSDFTOptions::GrSDFTOptions(SkScalar min, SkScalar max)
+        : fMinDistanceFieldFontSize{min}
+        , fMaxDistanceFieldFontSize{max} {
+    SkASSERT_RELEASE(min > 0 && max >= min);
 }
 
-bool GrTextContext::Options::canDrawAsDistanceFields(const SkPaint& paint, const SkFont& font,
-                                                     const SkMatrix& viewMatrix,
-                                                     const SkSurfaceProps& props,
-                                                     bool contextSupportsDistanceFieldText) const {
+bool GrSDFTOptions::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;
@@ -102,9 +94,9 @@ SkScalar scaled_text_size(const SkScalar textSize, const SkMatrix& viewMatrix) {
     return scaledTextSize;
 }
 
-SkFont GrTextContext::Options::getSDFFont(const SkFont& font,
-                                          const SkMatrix& viewMatrix,
-                                          SkScalar* textRatio) const {
+SkFont GrSDFTOptions::getSDFFont(const SkFont& font,
+                                 const SkMatrix& viewMatrix,
+                                 SkScalar* textRatio) const {
     SkScalar textSize = font.getSize();
     SkScalar scaledTextSize = scaled_text_size(textSize, viewMatrix);
 
@@ -140,7 +132,7 @@ SkFont GrTextContext::Options::getSDFFont(const SkFont& font,
     return dfFont;
 }
 
-std::pair<SkScalar, SkScalar> GrTextContext::Options::computeSDFMinMaxScale(
+std::pair<SkScalar, SkScalar> GrSDFTOptions::computeSDFMinMaxScale(
         SkScalar textSize, const SkMatrix& viewMatrix) const {
 
     SkScalar scaledTextSize = scaled_text_size(textSize, viewMatrix);
@@ -172,8 +164,4 @@ std::pair<SkScalar, SkScalar> GrTextContext::Options::computeSDFMinMaxScale(
     return std::make_pair(dfMaskScaleFloor / scaledTextSize, dfMaskScaleCeil / scaledTextSize);
 }
 
-SkPaint GrTextContext::InitDistanceFieldPaint(const SkPaint& paint) {
-    SkPaint dfPaint{paint};
-    dfPaint.setMaskFilter(GrSDFMaskFilter::Make());
-    return dfPaint;
-}
+
diff --git a/src/gpu/text/GrSDFTOptions.h b/src/gpu/text/GrSDFTOptions.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrSDFTOptions_DEFINED
+#define GrSDFTOptions_DEFINED
+
+#include "include/core/SkFont.h"
+#include "include/core/SkScalar.h"
+
+class SkMatrix;
+class SkSurfaceProps;
+
+class GrSDFTOptions {
+public:
+    GrSDFTOptions(SkScalar min, SkScalar max);
+
+    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;
+
+    // Above this size (in device space) distance field text will not be used and glyphs will
+    // be rendered from outline as individual paths.
+    const SkScalar fMaxDistanceFieldFontSize;
+};
+
+#endif  // GrSDFTOptions_DEFINED
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
@@ -27,7 +27,7 @@ class GrAtlasTextOp;
 class GrDeferredUploadTarget;
 class GrGlyph;
 class GrStrikeCache;
-class GrTextContext;
+class GrTextTarget;
 
 class SkMatrixProvider;
 class SkSurfaceProps;
diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h
diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp
