Windows implementation of multiline 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 263ef92d8159c7088650ddd538457e49061d7ea0..abbee29783cc11e56a09e3511ba1cc7e734f0d24 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -78,6 +79,47 @@ void RunMoveCursorLeftRightTest(RenderText* render_text,
   render_text->MoveCursor(LINE_BREAK, direction, false);
   EXPECT_EQ(expected.back(), render_text->selection_model());
 }
+
+// For segments in the same run, checks the continuity and order of |x_range|
+// and |char_range| fields.
+#if defined(OS_WIN)
+void CheckLineIntegrity(const std::vector<internal::Line>& lines,
+                        const ScopedVector<internal::TextRun>& runs) {
+  size_t previous_segment_line = 0;
+  const internal::LineSegment* previous_segment = NULL;
+
+  for (size_t i = 0; i < lines.size(); ++i) {
+    SCOPED_TRACE(base::StringPrintf("line %" PRIuS, i));
+    for (size_t j = 0; j < lines[i].segments.size(); ++j) {
+      SCOPED_TRACE(base::StringPrintf("segment %" PRIuS, j));
+      const internal::LineSegment* segment = &lines[i].segments[j];
+      internal::TextRun* run = runs[segment->run];
+
+      if (!previous_segment) {
+        previous_segment = segment;
+      } else if (runs[previous_segment->run] != run) {
+        previous_segment = NULL;
+      } else {
+        SCOPED_TRACE(run->script_analysis.fRTL ? "RTL" : "LTR");
+        SCOPED_TRACE(std::string("current x_range: ") +
+            segment->x_range.ToString());
+        SCOPED_TRACE(std::string("previous x_range: ") +
+            previous_segment->x_range.ToString());
+
+        EXPECT_EQ(previous_segment->char_range.end(),
+                  segment->char_range.start());
+        if (!run->script_analysis.fRTL)
+          EXPECT_EQ(previous_segment->x_range.end(), segment->x_range.start());
+        else if (i != previous_segment_line)

[msw, 2013/09/06 23:47:45]

I realize that we shouldn't break a run into separate segments, except to split
the run onto different lines, but I don't think this check on the else is
necessary. Shouldn't the text-space start/end x-coordinates of the segments
match, regardless of the line that the consecutive segments are placed on?

[ckocagil, 2013/09/11 14:59:49]

It doesn't seem necessary to me either. Done.

+          EXPECT_EQ(segment->x_range.end(), previous_segment->x_range.start());
+
+        previous_segment = segment;
+        previous_segment_line = i;
+      }
+    }
+  }
+}
+#endif  // defined(OS_WIN)
 
 }  // namespace
 
@@ -1294,7 +1336,7 @@ TEST_F(RenderTextTest, GetTextOffset) {
   Rect display_rect(font_size);
   render_text->SetDisplayRect(display_rect);
 
-  Vector2d offset = render_text->GetTextOffset();
+  Vector2d offset = render_text->GetLineOffset(0);
   EXPECT_TRUE(offset.IsZero());
 
   // Set display area's size greater than font size.
@@ -1303,30 +1345,30 @@ TEST_F(RenderTextTest, GetTextOffset) {
   render_text->SetDisplayRect(display_rect);
 
   // Check the default horizontal and vertical alignment.
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(kEnlargement / 2, offset.y());
   EXPECT_EQ(0, offset.x());
 
   // Check explicitly setting the horizontal alignment.
   render_text->SetHorizontalAlignment(ALIGN_LEFT);
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(0, offset.x());
   render_text->SetHorizontalAlignment(ALIGN_CENTER);
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(kEnlargement / 2, offset.x());
   render_text->SetHorizontalAlignment(ALIGN_RIGHT);
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(kEnlargement, offset.x());
 
   // Check explicitly setting the vertical alignment.
   render_text->SetVerticalAlignment(ALIGN_TOP);
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(0, offset.y());
   render_text->SetVerticalAlignment(ALIGN_VCENTER);
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(kEnlargement / 2, offset.y());
   render_text->SetVerticalAlignment(ALIGN_BOTTOM);
-  offset = render_text->GetTextOffset();
+  offset = render_text->GetLineOffset(0);
   EXPECT_EQ(kEnlargement, offset.y());
 
   SetRTL(was_rtl);
@@ -1334,7 +1376,7 @@ TEST_F(RenderTextTest, GetTextOffset) {
 
 TEST_F(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL) {
   // This only checks the default horizontal alignment in RTL mode; all other
-  // GetTextOffset() attributes are checked by the test above.
+  // GetLineOffset(0) attributes are checked by the test above.
   const bool was_rtl = base::i18n::IsRTL();
   SetRTL(true);
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
@@ -1345,7 +1387,7 @@ TEST_F(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL) {
                        render_text->GetStringSize().height());
   Rect display_rect(font_size);
   render_text->SetDisplayRect(display_rect);
-  Vector2d offset = render_text->GetTextOffset();
+  Vector2d offset = render_text->GetLineOffset(0);
   EXPECT_EQ(kEnlargement, offset.x());
   SetRTL(was_rtl);
 }
@@ -1650,5 +1692,58 @@ TEST_F(RenderTextTest, SelectionKeepsLigatures) {
     render_text->MoveCursorTo(SelectionModel(0, CURSOR_FORWARD));
   }
 }
+
+#if defined(OS_WIN)
+TEST_F(RenderTextTest, Multiline_MinWidth) {

[msw, 2013/09/06 23:47:45]

I'm looking forward to many more tests. Can you add this one now?
Add a Multiline_SufficientWidth or similar to test trivial behavior:
SetMultiline(true) but use strings (LTR, RTL, spaces, no spaces) that fit on one
line and don't wrap with the sufficiently wide display rect width.

[ckocagil, 2013/09/11 14:59:49]

Done.

+  const wchar_t* kTestStrings[] = { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl,
+                                    kRtlLtr, kRtlLtrRtl };
+
+  scoped_ptr<RenderTextWin> render_text(
+      static_cast<RenderTextWin*>(RenderText::CreateInstance()));
+  render_text->SetDisplayRect(Rect(Point(), Size(1, 1000)));
+  render_text->SetMultiline(true);
+  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);
+    CheckLineIntegrity(render_text->lines_, render_text->runs_);

[msw, 2013/09/06 23:47:45]

Can you EXPECT_GT(render_text->lines_.size(), 1U) here?

[ckocagil, 2013/09/11 14:59:49]

Done.

+  }
+}
+
+TEST_F(RenderTextTest, Multiline_NormalWidth) {
+  const struct {
+    wchar_t* text;

[msw, 2013/09/06 23:47:45]

nit: make all these members const.

[ckocagil, 2013/09/11 14:59:49]

Done.

+    ui::Range first_line;

[msw, 2013/09/06 23:47:45]

nit: |first_line_char_range| and |second_line_char_range|

[ckocagil, 2013/09/11 14:59:49]

Done.

+    ui::Range second_line;
+  } kTestStrings[] = {
+    { L"abc defg hijkl", ui::Range(0, 9), ui::Range(9, 14) },
+    { L"qwertyuiop", ui::Range(0, 8), ui::Range(8, 10) },

[msw, 2013/09/06 23:47:45]

nit: indent the ui::Range entries to match, even on line 1724.

[ckocagil, 2013/09/11 14:59:49]

Done.

+    { L"\x0647\x0630\x0627 \x0647\x0648 \x0627\x0644\x0628\x0627\x0628",
+      ui::Range(0, 7), ui::Range(7, 12) }
+  };
+
+  scoped_ptr<RenderTextWin> render_text(
+      static_cast<RenderTextWin*>(RenderText::CreateInstance()));
+  render_text->SetDisplayRect(Rect(Point(), Size(50, 1000)));
+  render_text->SetMultiline(true);
+  Canvas canvas;
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestStrings); ++i) {
+    SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
+    render_text->SetText(WideToUTF16(kTestStrings[i].text));
+    render_text->Draw(&canvas);
+    CheckLineIntegrity(render_text->lines_, render_text->runs_);
+    ASSERT_EQ(2U, render_text->lines_.size());
+    ASSERT_EQ(1U, render_text->lines_[0].segments.size());
+    EXPECT_EQ(kTestStrings[i].first_line,
+              render_text->lines_[0].segments[0].char_range);
+    ASSERT_EQ(1U, render_text->lines_[1].segments.size());
+    EXPECT_EQ(kTestStrings[i].second_line,
+              render_text->lines_[1].segments[0].char_range);
+  }
+}
+#endif  // defined(OS_WIN)
 
 }  // namespace gfx