commit 9edff53a73b76f2d7b75fa98e58b896ca676d154
author Mike Reed <reed@google.com> Fri Mar 05 11:15:07 2021 +0000
committer Mike Reed <reed@google.com> Fri Mar 05 11:15:22 2021 +0000
tree dd61c319436b2420fa6cdef118f68e6a09255ef1
parent 606a9ab831a8a4ab98a190c09401e91e478c86e7

Revert "rename GrSDFTOptions to GrSDFTControl"

This reverts commit 40a90612037ea6dc9a61ad07b1c64904cbecef71.

Reason for revert: breaking chrome roll (android-pie)?

Original change's description:
> rename GrSDFTOptions to GrSDFTControl
>
> Change-Id: Ie03fce7a99a9f71b18d54e3cd35e7675fb7f8912
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379616
> Commit-Queue: Herb Derby <herb@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=herb@google.com,robertphillips@google.com

Change-Id: I0483cbada23c76bdd5ccdb51936bb20a819343cb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379839
Reviewed-by: Mike Reed <reed@google.com>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index f98ecb7..b52a19e 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -500,8 +500,8 @@
     }
 
     auto rContext = rtc->recordingContext();
-    GrSDFTControl control =
-            rContext->priv().getSDFTControl(rtc->surfaceProps().isUseDeviceIndependentFonts());
+    GrSDFTOptions SDFOptions =
+            rContext->priv().getSDFTOptions(rtc->surfaceProps().isUseDeviceIndependentFonts());
 
     sk_sp<GrTextBlob> blob = GrTextBlob::Make(glyphRunList, drawMatrix);
     SkGlyphRunListPainter* painter = rtc->glyphRunPainter();
@@ -509,7 +509,7 @@
             *glyphRunList.begin(),
             drawMatrix,
             glyphRunList.paint(),
-            control,
+            SDFOptions,
             blob.get());
     if (blob->subRunList().isEmpty()) {
         return nullptr;