commit a08bde606acb2240c4cefe55610e9a3e350990fd
author Herb Derby <herb@google.com> Fri Jun 12 15:46:06 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 15 17:14:04 2020 +0000
tree db55d32bbe29c95adc3e943c3d913a36af68063c
parent 92219b464a4e9797f7773d04ec230c8678037671

GrTextContext::Options -> GrSDFTOptions

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>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index c900866..4e4e7f7 100644
--- 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 @@
 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 @@
     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;