commit 8fd014bb67078268b30455ee553dafe89187f6d1
author Herb Derby <herb@google.com> Tue Jan 11 20:43:13 2022 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Jan 13 17:23:20 2022 +0000
tree 6a9e6760f9d3efa3f0fc52bed7766e5d1ff78208
parent 61a03aa0b9e1f4a17f6be695896c3096bdab909c

align prepareForMaskDrawing to agree for remote and gpu

The prepareForMaskDrawing in the RemoteStrike and the SkScalerCache
must fully agree on the maximum dimensions calculations.

Bug: chromium:1280180

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

src/core/SkChromeRemoteGlyphCache.cpp

diff --git a/src/core/SkChromeRemoteGlyphCache.cpp b/src/core/SkChromeRemoteGlyphCache.cpp
index 1bf3c29..369465d 100644
--- a/src/core/SkChromeRemoteGlyphCache.cpp
+++ b/src/core/SkChromeRemoteGlyphCache.cpp
@@ -489,8 +489,17 @@
         }
 
         // Reject things that are too big.
+        // Only collect dimensions of the color glyphs assuming that paths will take care
+        // of the large mask glyphs. This may be inaccurate in the very rare case where
+        // a bitmap only font is being used.
+        // N.B. this must have the same behavior as SkScalerCache::prepareForMaskDrawing.
         if (!digest->canDrawAsMask()) {
-            rejects->reject(i);
+            if (digest->isColor()) {
+                // Paths can't handle color, so these will fall to the drawing of last resort.
+                rejects->reject(i, digest->maxDimension());
+            } else {
+                rejects->reject(i);
+            }
         }
     }
 }

src/core/SkScalerCache.cpp

diff --git a/src/core/SkScalerCache.cpp b/src/core/SkScalerCache.cpp
index 7194f70..b1fa70c 100644
--- a/src/core/SkScalerCache.cpp
+++ b/src/core/SkScalerCache.cpp
@@ -195,8 +195,12 @@
             if (digest.canDrawAsMask()) {
                 drawables->push_back(fGlyphForIndex[digest.index()], i);
             } else {
-                // Accumulate maximum dimensions for handling emoji scaling.
+                // Only collect dimensions of the color glyphs assuming that paths will take care
+                // of the large mask glyphs. This may be inaccurate in the very rare case where
+                // a bitmap only font is being used.
+                // N.B. this must have the same behavior as RemoteStrike::prepareForMaskDrawing.
                 if (digest.isColor()) {
+                    // Paths can't handle color, so these will fall to the drawing of last resort.
                     rejects->reject(i, digest.maxDimension());
                 } else {
                     rejects->reject(i);