commit 3d6bf04366f6bb33b058b39066dd92334c185a66
author Herb Derby <herb@google.com> Fri Jun 12 11:09:48 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 12 17:05:22 2020 +0000
tree a9d0e0bd1b4c46a494e7a55af844c314a8a785be
parent 2af055b14d709731340e4fa8cb80843fc8ddb531

make options robust

Options used to rely on an external call to SanitizeOptions to
ensure they were correct. Now that defaults are set directly,
make sure that the values coming in make sense.

Change-Id: If6cfc027722b6a7717a920b482ec5be8f7526367
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296040
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>

tests/SkRemoteGlyphCacheTest.cpp

diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp
index ef0124e..593c5e7 100644
--- a/tests/SkRemoteGlyphCacheTest.cpp
+++ b/tests/SkRemoteGlyphCacheTest.cpp
@@ -21,6 +21,7 @@
 #include "tools/ToolUtils.h"
 #include "tools/fonts/TestEmptyTypeface.h"
 
+#include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/text/GrTextContext.h"
 
@@ -689,8 +690,8 @@
     // A scale transform forces fallback to dft.
     SkMatrix matrix = SkMatrix::Scale(16, 16);
     SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);
-    GrTextContext::Options options;
-    GrTextContext::SanitizeOptions(&options);
+    GrTextContext::Options options =
+            ctxInfo.grContext()->priv().asRecordingContext()->priv().SDFTOptions();
     REPORTER_ASSERT(reporter, GrTextContext::CanDrawAsDistanceFields(
                                       paint, font, matrix, surfaceProps, true, options));