commit 636ee33902ddc27fd9683d250ceb23f65467488b
author Ben Wagner <bungeman@google.com> Wed Mar 13 10:50:33 2019 -0400
committer Ben Wagner <bungeman@google.com> Wed Mar 13 15:49:37 2019 +0000
tree 02f45a05530d709342a1d63f07e705fb7eedba54
parent 2c36ee834ae04d036363cd3b8f3f33ec65d657f0

Check that a glyph will fit in the atlas instead of a bogus check

I made a transcription error about 7 mo. ago. This corrects the error.

Change-Id: Icbe814a9e44748778bf988840fc2fc7ab9e8fa86
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200500
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Cherry-Pick: fbf260df762d773602fea4cb4713e5ed96e9983f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200929
Reviewed-by: Herb Derby <herb@google.com>

src/core/SkGlyphRunPainter.cpp

diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 9ef9c05..4e497ab 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -266,7 +266,8 @@
 
     // If the situation that the matrix is simple, and all the glyphs are small enough. Go fast!
     bool useFastPath =
-            viewMatrix.isScaleTranslate() && conservativeMaxGlyphDimension <= maxGlyphDimension;
+            viewMatrix.isScaleTranslate()
+            && conservativeMaxGlyphDimension <= SkStrikeCommon::kSkSideTooBigForAtlas;
 
     auto glyphIDs = SkSpan<const SkGlyphID>{fARGBGlyphsIDs};