Fix for distancefield text uses override descriptor

src/gpu/GrAtlasTextContext.cpp

Index: src/gpu/GrAtlasTextContext.cpp
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index 337813801bf899930cdbb26779bb60a60f786f8e..8105be74e699ea447ba2606b3f20bec757435dfd 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -1671,8 +1671,9 @@ private:
                     info.fBulkUseToken.reset();
 
                     // We can reuse if we have a valid strike and our descriptors / typeface are the
-                    // same
-                    const SkDescriptor* newDesc = run.fOverrideDescriptor ?
+                    // same.  The override descriptor is only for the non distance field text within
+                    // a run
+                    const SkDescriptor* newDesc = (run.fOverrideDescriptor && !usesDistanceFields) ?
                                                   run.fOverrideDescriptor->getDesc() :
                                                   run.fDescriptor.getDesc();
                     if (!cache || !SkTypeface::Equal(typeface, run.fTypeface) ||