From 93e0041c6ca7e2e9fa8047ef67ed3804f2ccbef9 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Fri, 7 Jan 2022 11:36:40 -0500 Subject: [PATCH] more direct glyph drawing Allow direct glyph drawing to handle more cases. Instead of using the approximate glyphs size to control using direct drawing, directly measure each glyph. This will be useful in latter CL to better scale *very* big emoji. This is its own CL to check pixel problem in chrome layout and google3. It's a simple revert. Bug: chromium:1280180 Change-Id: Ic2e4aed7d401b99909ba2aceaf0f2f849070a80c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/492402 Reviewed-by: Robert Phillips Commit-Queue: Herb Derby --- src/core/SkGlyphRunPainter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp index 8dbf9dc960..7814b4685c 100644 --- a/src/core/SkGlyphRunPainter.cpp +++ b/src/core/SkGlyphRunPainter.cpp @@ -287,8 +287,7 @@ void SkGlyphRunListPainter::processGlyphRun(const SkGlyphRun& glyphRun, } } - if (!fRejects.source().empty() && - approximateDeviceTextSize <= SkStrikeCommon::kSkSideTooBigForAtlas) { + if (!fRejects.source().empty()) { // Process masks including ARGB - this should be the 99.99% case. // This will handle medium size emoji that are sharing the run with SDFT drawn text. // If things are too big they will be passed along to the drawing of last resort below.