commit 6e6333fba4d3d8e16c2db5fccbd09072eea157a7
author Julia Lavrova <jlavrova@google.com> Mon Jun 17 10:34:10 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 18 19:23:33 2019 +0000
tree 7c642e0af181bd7517e37fae51ce5fa7db7fa22c
parent 66a46033a6c021c5c4b6c06feceedb6d677685be

Refactor font resolution out of font iterator;
few minor bug fixes

Change-Id: Ibc60e972480f3503965af873f36001ed233382ec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221544
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 87a9835..4122c84 100644
--- a/modules/skparagraph/src/TextWrapper.cpp
+++ b/modules/skparagraph/src/TextWrapper.cpp
@@ -14,6 +14,9 @@
     for (auto cluster = fEndLine.endCluster(); cluster < endOfClusters; ++cluster) {
         if (fWords.width() + fClusters.width() + cluster->width() > maxWidth) {
             if (cluster->isWhitespaces()) {
+                // It's the end of the word
+                fMinIntrinsicWidth = SkTMax(fMinIntrinsicWidth, getClustersTrimmedWidth());
+                fWords.extend(fClusters);
                 break;
             }
             if (cluster->width() > maxWidth) {
@@ -76,16 +79,14 @@
 }
 
 // Special case for start/end cluster since they can be clipped
-void TextWrapper::trimEndSpaces(bool includingClusters) {
+void TextWrapper::trimEndSpaces() {
     // Remember the breaking position
     fEndLine.saveBreak();
-    if (includingClusters) {
-        // Move the end of the line to the left
-        for (auto cluster = fEndLine.endCluster();
-             cluster >= fEndLine.startCluster() && cluster->isWhitespaces();
-             --cluster) {
-            fEndLine.trim(cluster);
-        }
+    // Move the end of the line to the left
+    for (auto cluster = fEndLine.endCluster();
+         cluster >= fEndLine.startCluster() && cluster->isWhitespaces();
+         --cluster) {
+        fEndLine.trim(cluster);
     }
     fEndLine.trim();
 }
@@ -132,7 +133,6 @@
     auto span = parent->clusters();
     auto maxLines = parent->paragraphStyle().getMaxLines();
     auto ellipsisStr = parent->paragraphStyle().getEllipsis();
-    auto textAlign = parent->paragraphStyle().effective_align();
 
     fHeight = 0;
     fMinIntrinsicWidth = 0;
@@ -146,7 +146,7 @@
         moveForward();
 
         // Do not trim end spaces on the naturally last line of the left aligned text
-        trimEndSpaces(textAlign != TextAlign::kLeft || fEndLine.endCluster() < end - 1);
+        trimEndSpaces();
 
         auto lastLine = maxLines == std::numeric_limits<size_t>::max() ||
             fLineNumber >= maxLines;