commit db9f669eb16f69a30ef9dc4090c4e2e7ad076af8
author Julia Lavrova <jlavrova@google.com> Thu Aug 01 16:02:17 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 09 18:56:13 2019 +0000
tree ca44cf9aba970a72a7b6c4807dbe6e5da202880d
parent 5ed96f7213c95b0faef0da2438d056203e44c6ab

Dealing with ghost spaces

Change-Id: I9cf133e915658f17d00f279ee1fa2662effa2021
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/231646
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Julia Lavrova <jlavrova@google.com>

modules/skparagraph/src/TextStyle.cpp

diff --git a/modules/skparagraph/src/TextStyle.cpp b/modules/skparagraph/src/TextStyle.cpp
index 6304827..16de5b9 100644
--- a/modules/skparagraph/src/TextStyle.cpp
+++ b/modules/skparagraph/src/TextStyle.cpp
@@ -21,6 +21,7 @@
     fLetterSpacing = 0.0;
     fWordSpacing = 0.0;
     fHeight = 1.0;
+    fHeightOverride = false;
     fHasBackground = false;
     fHasForeground = false;
     fTextBaseline = TextBaseline::kAlphabetic;
@@ -121,5 +122,18 @@
     }
 }
 
+void TextStyle::getFontMetrics(SkFontMetrics* metrics) const {
+    SkFont font(fTypeface, fFontSize);
+    font.getMetrics(metrics);
+    if (fHeight == 0 || fHeight == 1) {
+        metrics->fAscent = (metrics->fAscent - metrics->fLeading / 2);
+        metrics->fDescent = (metrics->fDescent + metrics->fLeading / 2);
+    } else {
+        auto height = metrics->fDescent - metrics->fAscent + metrics->fLeading;
+        metrics->fAscent = (metrics->fAscent - metrics->fLeading / 2) * height / fHeight;
+        metrics->fDescent = (metrics->fDescent + metrics->fLeading / 2) * height / fHeight;
+    }
+}
+
 }  // namespace textlayout
 }  // namespace skia