Reduce the number of text reshaping in RenderText

ui/gfx/render_text_unittest.cc

Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 44aaa1a43b5772eefff567e04d4a8f802b97a011..3fb05899bcd927f4e1baf8ab0218762297569b1b 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -429,6 +429,9 @@ TEST_F(RenderTextTest, ElidedText) {
   render_text->SetElideBehavior(ELIDE_TAIL);
 
   for (size_t i = 0; i < arraysize(cases); i++) {
+    SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "] '%ls'", i,
+                                    cases[i].text));
+
     // Compute expected width
     expected_render_text->SetText(WideToUTF16(cases[i].layout_text));
     int expected_width = expected_render_text->GetContentWidth();
@@ -438,13 +441,10 @@ TEST_F(RenderTextTest, ElidedText) {
     // and so it will get elided.
     if (cases[i].elision_expected)
       input.append(WideToUTF16(L" MMMMMMMMMMM"));
-
     render_text->SetText(input);
     render_text->SetDisplayRect(Rect(0, 0, expected_width, 100));
-    EXPECT_EQ(input, render_text->text())
-        << "->For case " << i << ": " << cases[i].text << "\n";
-    EXPECT_EQ(WideToUTF16(cases[i].layout_text), render_text->GetLayoutText())
-        << "->For case " << i << ": " << cases[i].text << "\n";
+    EXPECT_EQ(input, render_text->text());
+    EXPECT_EQ(WideToUTF16(cases[i].layout_text), render_text->GetLayoutText());
     expected_render_text->SetText(base::string16());
   }
 }
@@ -1367,14 +1367,9 @@ TEST_F(RenderTextTest, MinLineHeight) {
   ASSERT_NE(0, default_size.width());
 
   render_text->SetMinLineHeight(default_size.height() / 2);
-  // MacOSX does not recompute the bounds properly, so invoke ResetLayout()
-  // explicitly.
-  // TODO(mukai): fix this.
-  render_text->ResetLayout();
   EXPECT_EQ(default_size.ToString(), render_text->GetStringSizeF().ToString());
 
   render_text->SetMinLineHeight(default_size.height() * 2);
-  render_text->ResetLayout();
   SizeF taller_size = render_text->GetStringSizeF();
   EXPECT_EQ(default_size.height() * 2, taller_size.height());
   EXPECT_EQ(default_size.width(), taller_size.width());
@@ -2003,6 +1998,24 @@ TEST_F(RenderTextTest, Multiline_Newline) {
   }
 }
 
+// Make sure that multiple mode ignores elide behavior.
+TEST_F(RenderTextTest, Multiline_IgnoreElide) {
+  const wchar_t kTestString[] =
+      L"very very very long string xxxxxxxxxxxxxxxxxxxxxxxxxx";
+  const wchar_t kEllipsis[] = L"\x2026";
+
+  RenderTextHarfBuzz render_text;
+  render_text.SetElideBehavior(ELIDE_TAIL);
+  render_text.SetDisplayRect(Rect(20, 1000));
+  render_text.SetText(base::WideToUTF16(kTestString));
+  EXPECT_NE(base::string16::npos,
+            render_text.GetLayoutText().find(base::WideToUTF16(kEllipsis)));
+
+  render_text.SetMultiline(true);
+  EXPECT_EQ(base::string16::npos,
+            render_text.GetLayoutText().find(base::WideToUTF16(kEllipsis)));
+}
+
 TEST_F(RenderTextTest, NewlineWithoutMultilineFlag) {
   const wchar_t* kTestStrings[] = {
     L"abc\ndef", L"a \n b ", L"ab\n", L"a\n\nb", L"\nab", L"\n",
@@ -2097,8 +2110,9 @@ TEST_F(RenderTextTest, HarfBuzz_SubglyphGraphemeCases) {
     base::string16 text = WideToUTF16(cases[i]);
     render_text.SetText(text);
     render_text.EnsureLayout();
-    ASSERT_EQ(1U, render_text.runs_.size());
-    internal::TextRunHarfBuzz* run = render_text.runs_[0];
+    internal::TextRunList* run_list = render_text.GetRunList();
+    ASSERT_EQ(1U, run_list->size());
+    internal::TextRunHarfBuzz* run = run_list->runs()[0];
 
     base::i18n::BreakIterator* iter = render_text.grapheme_iterator_.get();
     auto first_grapheme_bounds = run->GetGraphemeBounds(iter, 0);
@@ -2170,10 +2184,11 @@ TEST_F(RenderTextTest, HarfBuzz_RunDirection) {
       WideToUTF16(L"\x05D0\x05D1" L"1234" L"\x05D2\x05D3");
   render_text.SetText(mixed);
   render_text.EnsureLayout();
-  ASSERT_EQ(3U, render_text.runs_.size());
-  EXPECT_TRUE(render_text.runs_[0]->is_rtl);
-  EXPECT_FALSE(render_text.runs_[1]->is_rtl);
-  EXPECT_TRUE(render_text.runs_[2]->is_rtl);
+  internal::TextRunList* run_list = render_text.GetRunList();
+  ASSERT_EQ(3U, run_list->size());
+  EXPECT_TRUE(run_list->runs()[0]->is_rtl);
+  EXPECT_FALSE(run_list->runs()[1]->is_rtl);
+  EXPECT_TRUE(run_list->runs()[2]->is_rtl);
 }
 
 TEST_F(RenderTextTest, HarfBuzz_BreakRunsByUnicodeBlocks) {
@@ -2182,17 +2197,19 @@ TEST_F(RenderTextTest, HarfBuzz_BreakRunsByUnicodeBlocks) {
   // The '\x25B6' "play character" should break runs. http://crbug.com/278913
   render_text.SetText(WideToUTF16(L"x\x25B6y"));
   render_text.EnsureLayout();
-  ASSERT_EQ(3U, render_text.runs_.size());
-  EXPECT_EQ(Range(0, 1), render_text.runs_[0]->range);
-  EXPECT_EQ(Range(1, 2), render_text.runs_[1]->range);
-  EXPECT_EQ(Range(2, 3), render_text.runs_[2]->range);
+  internal::TextRunList* run_list = render_text.GetRunList();
+  ASSERT_EQ(3U, run_list->size());
+  EXPECT_EQ(Range(0, 1), run_list->runs()[0]->range);
+  EXPECT_EQ(Range(1, 2), run_list->runs()[1]->range);
+  EXPECT_EQ(Range(2, 3), run_list->runs()[2]->range);
 
   render_text.SetText(WideToUTF16(L"x \x25B6 y"));
   render_text.EnsureLayout();
-  ASSERT_EQ(3U, render_text.runs_.size());
-  EXPECT_EQ(Range(0, 2), render_text.runs_[0]->range);
-  EXPECT_EQ(Range(2, 3), render_text.runs_[1]->range);
-  EXPECT_EQ(Range(3, 5), render_text.runs_[2]->range);
+  run_list = render_text.GetRunList();
+  ASSERT_EQ(3U, run_list->size());
+  EXPECT_EQ(Range(0, 2), run_list->runs()[0]->range);
+  EXPECT_EQ(Range(2, 3), run_list->runs()[1]->range);
+  EXPECT_EQ(Range(3, 5), run_list->runs()[2]->range);
 }
 
 TEST_F(RenderTextTest, HarfBuzz_BreakRunsByEmoji) {
@@ -2203,12 +2220,13 @@ TEST_F(RenderTextTest, HarfBuzz_BreakRunsByEmoji) {
   // separated. See crbug.com/448909
   render_text.SetText(UTF8ToUTF16("x\xF0\x9F\x98\x81y\xE2\x9C\xA8"));
   render_text.EnsureLayout();
-  ASSERT_EQ(4U, render_text.runs_.size());
-  EXPECT_EQ(Range(0, 1), render_text.runs_[0]->range);
+  internal::TextRunList* run_list = render_text.GetRunList();
+  ASSERT_EQ(4U, run_list->size());
+  EXPECT_EQ(Range(0, 1), run_list->runs()[0]->range);
   // The length is 2 since U+1F601 is represented as a surrogate pair in UTF16.
-  EXPECT_EQ(Range(1, 3), render_text.runs_[1]->range);
-  EXPECT_EQ(Range(3, 4), render_text.runs_[2]->range);
-  EXPECT_EQ(Range(4, 5), render_text.runs_[3]->range);
+  EXPECT_EQ(Range(1, 3), run_list->runs()[1]->range);
+  EXPECT_EQ(Range(3, 4), run_list->runs()[2]->range);
+  EXPECT_EQ(Range(4, 5), run_list->runs()[3]->range);
 }
 
 TEST_F(RenderTextTest, GlyphBounds) {
@@ -2231,10 +2249,11 @@ TEST_F(RenderTextTest, HarfBuzz_NonExistentFont) {
   RenderTextHarfBuzz render_text;
   render_text.SetText(ASCIIToUTF16("test"));
   render_text.EnsureLayout();
-  ASSERT_EQ(1U, render_text.runs_.size());
-  internal::TextRunHarfBuzz* run = render_text.runs_[0];
+  internal::TextRunList* run_list = render_text.GetRunList();
+  ASSERT_EQ(1U, run_list->size());
+  internal::TextRunHarfBuzz* run = run_list->runs()[0];
   render_text.ShapeRunWithFont(
-      run, "TheFontThatDoesntExist", FontRenderParams());
+      render_text.text(), "TheFontThatDoesntExist", FontRenderParams(), run);
 }
 
 // Ensure an empty run returns sane values to queries.
@@ -2312,8 +2331,9 @@ TEST_F(RenderTextTest, HarfBuzz_UniscribeFallback) {
   // Korean character "han".
   render_text.SetText(WideToUTF16(L"\xd55c"));
   render_text.EnsureLayout();
-  ASSERT_EQ(1U, render_text.runs_.size());
-  EXPECT_EQ(0U, render_text.runs_[0]->CountMissingGlyphs());
+  internal::TextRunList* run_list = render_text.GetRunList();
+  ASSERT_EQ(1U, run_list->size());
+  EXPECT_EQ(0U, run_list->runs()[0]->CountMissingGlyphs());
 }
 #endif  // defined(OS_WIN)