Do not add ghost runs for trailing whitespace if the text is ellipsized (#7906)

jason-simmons · GaryQian · commit a5773d12116f · 2019-02-21T13:36:33.000-08:00
diff --git a/third_party/txt/src/txt/paragraph.cc b/third_party/txt/src/txt/paragraph.cc
@@ -561,7 +561,8 @@ void Paragraph::Layout(double width, bool force) {
       // let it impact metrics. After layout of the whitespace run, we do not
       // add its width into the x-offset adjustment, effectively nullifying its
       // impact on the layout.
-      if (line_range.end_excluding_whitespace < line_range.end &&
+      if (paragraph_style_.ellipsis.empty() &&
+          line_range.end_excluding_whitespace < line_range.end &&
           bidi_run.start() <= line_range.end &&
           bidi_run.end() > line_end_index) {
         line_runs.emplace_back(std::max(bidi_run.start(), line_end_index),
diff --git a/third_party/txt/tests/paragraph_unittests.cc b/third_party/txt/tests/paragraph_unittests.cc
@@ -2496,7 +2496,7 @@ TEST_F(ParagraphTest, Ellipsize) {
 
   // Check that the ellipsizer limited the text to one line and did not wrap
   // to a second line.
-  ASSERT_EQ(paragraph->records_.size(), 2ull);
+  ASSERT_EQ(paragraph->records_.size(), 1ull);
 }
 
 // Test for shifting when identical runs of text are built as multiple runs.

Original file line number	Diff line number	Diff line change
`@@ -2496,7 +2496,7 @@ TEST_F(ParagraphTest, Ellipsize) {`
`2496`	`2496`
`2497`	`2497`	`// Check that the ellipsizer limited the text to one line and did not wrap`
`2498`	`2498`	`// to a second line.`
`2499`		`- ASSERT_EQ(paragraph->records_.size(), 2ull);`
	`2499`	`+ ASSERT_EQ(paragraph->records_.size(), 1ull);`
`2500`	`2500`	`}`
`2501`	`2501`
`2502`	`2502`	`// Test for shifting when identical runs of text are built as multiple runs.`