commit 9ca55f2ef3f26d43a919afa58c5b760b5635a693
author Ben Wagner <bungeman@google.com> Tue Feb 12 15:04:17 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 12 20:50:38 2019 +0000
tree ce793944df9a17e4c472c26a1268855ca23be474
parent 14d64dd4c47c2ecf45e8b9e02b264fcd5eea7b09

Check both thickness and position in gm.

Previously only position was checked (twice).

Bug: skia:8755
Change-Id: Ic169a08723853dd0e69a160b3f34506e922f0736
Reviewed-on: https://skia-review.googlesource.com/c/191662
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

gm/fontmgr.cpp

diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index a22c36c..a9190cb 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -236,7 +236,7 @@
         metricsPaint.setStyle(SkPaint::kFill_Style);
         metricsPaint.setAlpha(0x40);
         if ((fm.fFlags & SkFontMetrics::kUnderlinePositionIsValid_Flag) &&
-            (fm.fFlags & SkFontMetrics::kUnderlinePositionIsValid_Flag))
+            (fm.fFlags & SkFontMetrics::kUnderlineThicknessIsValid_Flag))
         {
             SkRect underline{ fontBounds.fLeft,  fm.fUnderlinePosition+y,
                               fontBounds.fRight, fm.fUnderlinePosition+y + fm.fUnderlineThickness };
@@ -244,7 +244,7 @@
         }
 
         if ((fm.fFlags & SkFontMetrics::kStrikeoutPositionIsValid_Flag) &&
-            (fm.fFlags & SkFontMetrics::kStrikeoutPositionIsValid_Flag))
+            (fm.fFlags & SkFontMetrics::kStrikeoutThicknessIsValid_Flag))
         {
             SkRect strikeout{ fontBounds.fLeft,  fm.fStrikeoutPosition+y - fm.fStrikeoutThickness,
                               fontBounds.fRight, fm.fStrikeoutPosition+y };