commit 916a904fb7f2c827ac207e6ae7ecfce53ee85f55
author Julia Lavrova <jlavrova@google.com> Thu Aug 08 16:51:27 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 20 18:24:40 2019 +0000
tree 740533141b50d2768ab007159f4e34662de4f689
parent 8f3bd77699b789295b9e5bc4af1fd375a821de9f

Placeholders implementation + unit tests

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

modules/skparagraph/src/TextWrapper.cpp

diff --git a/modules/skparagraph/src/TextWrapper.cpp b/modules/skparagraph/src/TextWrapper.cpp
index 8792a5a..34760c6 100644
--- a/modules/skparagraph/src/TextWrapper.cpp
+++ b/modules/skparagraph/src/TextWrapper.cpp
@@ -152,6 +152,7 @@
     fEndLine = TextStretch(span.begin(), span.begin(), parent->strutForceHeight());
     auto end = span.end() - 1;
     auto start = span.begin();
+    LineMetrics maxRunMetrics;
     while (fEndLine.endCluster() != end) {
         reset();
 
@@ -176,10 +177,26 @@
                 maxWidth != std::numeric_limits<SkScalar>::max() &&
                 !ellipsisStr.isEmpty();
         // TODO: perform ellipsis work here
+
+        // Deal with placeholder clusters == runs[@size==1]
+        for (auto cluster = fEndLine.startCluster(); cluster <= fEndLine.endCluster(); ++cluster) {
+            if (cluster->run()->placeholder() != nullptr) {
+                SkASSERT(cluster->run()->size() == 1);
+                // Update the placeholder metrics so we can get the placeholder positions later
+                // and the line metrics (to make sure the placeholder fits)
+                cluster->run()->updateMetrics(&fEndLine.metrics());
+            }
+        }
+
+        // Before we update the line metrics with struts,
+        // let's save it for GetRectsForRange(RectHeightStyle::kMax)
+        maxRunMetrics = fEndLine.metrics();
+
         if (parent->strutEnabled()) {
             // Make sure font metrics are not less than the strut
             parent->strutMetrics().updateLineMetrics(fEndLine.metrics());
         }
+
         fMaxIntrinsicWidth = SkMaxScalar(fMaxIntrinsicWidth, fEndLine.width());
         // TODO: keep start/end/break info for text and runs but in a better way that below
         TextRange text(fEndLine.startCluster()->textRange().start, fEndLine.endCluster()->textRange().end + 1);
@@ -199,10 +216,12 @@
                 fEndLine.metrics(),
                 needEllipsis);
 
+        parent->lines().back().setMaxRunMetrics(maxRunMetrics);
+
         // Start a new line
         fHeight += fEndLine.metrics().height();
 
-        if (!fHardLineBreak) {
+        if (!fHardLineBreak || startLine != end) {
             fEndLine.clean();
         }
         fEndLine.startFrom(startLine, pos);
@@ -215,6 +234,7 @@
     }
 
     if (fHardLineBreak) {
+
         // Last character is a line break
         if (parent->strutEnabled()) {
             // Make sure font metrics are not less than the strut
@@ -231,6 +251,7 @@
                 SkVector::Make(0, fEndLine.metrics().height()),
                 fEndLine.metrics(),
                 false);
+        parent->lines().back().setMaxRunMetrics(maxRunMetrics);
     }
 }