commit 317adf73a6452b70a0f740615a87a0b55cc54d33
author Herb Derby <herb@google.com> Fri Nov 16 17:29:29 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 03 18:23:38 2018 +0000
tree 3f98246375b3bea5c3d515fd8ecdccee2a2e7459
parent 9a51a86b5eb1918d16650f5d8fdc1d687875c2fe

Make fallback descriptors explicit

Have the subruns carry a pointer to the descriptor they need.
This simplifies the regen code, and makes ARGB fallback more explicit.

Change-Id: If11477cb9ecccc90ae262327e0579f4ab249836e
Reviewed-on: https://skia-review.googlesource.com/c/171586
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/text/GrTextBlobVertexRegenerator.cpp

diff --git a/src/gpu/text/GrTextBlobVertexRegenerator.cpp b/src/gpu/text/GrTextBlobVertexRegenerator.cpp
index 20fc31f..0cfddf6 100644
--- a/src/gpu/text/GrTextBlobVertexRegenerator.cpp
+++ b/src/gpu/text/GrTextBlobVertexRegenerator.cpp
@@ -238,9 +238,7 @@
     if (regenTexCoords) {
         fSubRun->resetBulkUseToken();
 
-        const SkDescriptor* desc = (fRun->fOverrideDescriptor && !fSubRun->drawAsDistanceFields())
-                                           ? fRun->fOverrideDescriptor->getDesc()
-                                           : fRun->fDescriptor.getDesc();
+        const SkDescriptor* desc = fSubRun->desc();
 
         if (!*fLazyCache || (*fLazyCache)->getDescriptor() != *desc) {
             SkScalerContextEffects effects;