Move allow_character_break property to RenderText.

ui/gfx/render_text_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text.h"
 
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/i18n/break_iterator.h"
@@ skipping 2058 matching lines @@
 }
 
 // Ensure strings wrap onto multiple lines for a small available width.
 TEST_F(RenderTextTest, Multiline_MinWidth) {
   const wchar_t* kTestStrings[] = { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl,
                                     kRtlLtr, kRtlLtrRtl };
 
   RenderTextHarfBuzz render_text;
   render_text.SetDisplayRect(Rect(1, 1000));
   render_text.SetMultiline(true);
+  render_text.SetWordWrapBehavior(WRAP_LONG_WORDS);
   Canvas canvas;
 
   for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
     SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
     render_text.SetText(WideToUTF16(kTestStrings[i]));
     render_text.Draw(&canvas);
     EXPECT_GT(render_text.lines_.size(), 1U);
   }
 }
 
@@ skipping 13 matching lines @@
     { L"\x062A\x0641\x0627\x062D\x05EA\x05E4\x05D5\x05D6\x05D9"
       L"\x05DA\x05DB\x05DD", Range(0, 4), Range(4, 12), false }
   };
 
   RenderTextHarfBuzz render_text;
   // Specify the fixed width for characters to suppress the possible variations
   // of linebreak results.
   render_text.set_glyph_width_for_test(5);
   render_text.SetDisplayRect(Rect(50, 1000));
   render_text.SetMultiline(true);
+  render_text.SetWordWrapBehavior(WRAP_LONG_WORDS);
   render_text.SetHorizontalAlignment(ALIGN_TO_HEAD);
 
   Canvas canvas;
   TestSkiaTextRenderer renderer(&canvas);
 
   for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
     SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
     render_text.SetText(WideToUTF16(kTestStrings[i].text));
     render_text.EnsureLayout();
     render_text.DrawVisualTextInternal(&renderer);
@@ skipping 166 matching lines @@
       std::vector<base::string16> lines;
       base::SplitString(base::WideToUTF16(kTestStrings[i].text), '\n', &lines);
       ASSERT_EQ(2u, lines.size());
       int difference = (lines[0].length() - lines[1].length()) * kGlyphSize;
       EXPECT_EQ(render_text.GetAlignmentOffset(0).x() + difference,
                 render_text.GetAlignmentOffset(1).x());
     }
   }
 }
 
+TEST_F(RenderTextTest, Multiline_WordWrapBehavior) {
+  RenderTextHarfBuzz render_text;
+  render_text.SetMultiline(true);
+  render_text.SetText(ASCIIToUTF16("foo "));
+  const int foo_width = render_text.GetStringSize().width();
+
+  render_text.SetText(ASCIIToUTF16("foo fooooo foo"));
+  render_text.SetDisplayRect(Rect(0, 0, foo_width, 0));
+
+  Canvas canvas;
+  render_text.Draw(&canvas);

[msw, 2015/03/26 19:36:30]

nit: either render_text.SetWordWrapBehavior(IGNORE_LONG_WORDS); or
DCHECK_EQ(IGNORE_LONG_WORDS, render_text.word_wrap_behavior()); before this.

[Jun Mukai, 2015/03/26 22:47:38]

Done.

+  EXPECT_EQ(3u, render_text.lines().size());
+  EXPECT_EQ(Range(0, 4), render_text.lines()[0].segments[0].char_range);

[msw, 2015/03/26 19:36:30]

I think you'll need to do render_text.set_glyph_width_for_test(glyph_width) to
ensure that you get the same char ranges on each line across platforms (with
different fonts that yield different glyph widths). Then you can just do
render_text.SetDisplayRect(Rect(0, 0, 4 * glyph_width, 0)); above and remove
lines 2303 and 2304.

[Jun Mukai, 2015/03/26 22:47:38]

Done, great.

+  EXPECT_EQ(Range(4, 11), render_text.lines()[1].segments[0].char_range);
+  EXPECT_EQ(Range(11, 14), render_text.lines()[2].segments[0].char_range);
+
+  render_text.SetWordWrapBehavior(TRUNCATE_LONG_WORDS);
+  render_text.Draw(&canvas);
+  EXPECT_EQ(3u, render_text.lines().size());
+  EXPECT_EQ(Range(0, 4), render_text.lines()[0].segments[0].char_range);
+  EXPECT_GT(11u, render_text.lines()[1].segments[0].char_range.end());

[msw, 2015/03/26 19:36:30]

With a fixed width, you can expect this to equal (4, 8).

[Jun Mukai, 2015/03/26 22:47:38]

Done.

+  EXPECT_EQ(Range(11, 14), render_text.lines()[2].segments[0].char_range);
+
+  // TODO(mukai): implement ELIDE_LONG_WORDS. It's not used right now.
+
+  render_text.SetWordWrapBehavior(WRAP_LONG_WORDS);
+  render_text.Draw(&canvas);
+  EXPECT_LE(4u, render_text.lines().size());

[msw, 2015/03/26 19:36:30]

With a fixed width, you can expect this to equal 4 and the following lines can
expect exact ranges; I think they'll be: (0, 4), (4, 8), (8, 11), (11, 14).

[Jun Mukai, 2015/03/26 22:47:38]

Done.

+  EXPECT_EQ(Range(0, 4), render_text.lines()[0].segments[0].char_range);
+  for (size_t i = 0; i < render_text.lines().size() - 1; ++i) {
+    Range char_range = render_text.lines()[i].segments[0].char_range;
+    Range next_char_range = render_text.lines()[i + 1].segments[0].char_range;
+    EXPECT_EQ(char_range.end(), next_char_range.start())
+        << i << " " << char_range << " vs " << next_char_range;
+  }
+  EXPECT_EQ(14u, render_text.lines()[render_text.lines().size() - 1]
+                     .segments[0].char_range.end());
+}
+
 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",
   };
 
   RenderTextHarfBuzz render_text;
   render_text.SetDisplayRect(Rect(200, 1000));
   Canvas canvas;
 
   for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
@@ skipping 564 matching lines @@
   string_size.set_width(string_size.width() / 2);
   render_text.SetDisplayRect(gfx::Rect(string_size));
   render_text.EnsureLayout();
   CFIndex glyph_count = CTLineGetGlyphCount(render_text.line_);
   EXPECT_GT(text.size(), static_cast<size_t>(glyph_count));
   EXPECT_NE(0, glyph_count);
 }
 #endif
 
 }  // namespace gfx