Fix alignment format in multiline mode

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"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/break_list.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/range/range.h"
@@ skipping 2114 matching lines @@
     // by symbols, therefore the character should be changed.
     EXPECT_NE(WideToUTF16(kTestStrings[i]), render_text.GetDisplayText());
 
     // Setting multiline will fix this, the newline characters will be back
     // to the original text.
     render_text.SetMultiline(true);
     EXPECT_EQ(WideToUTF16(kTestStrings[i]), render_text.GetDisplayText());
   }
 }
 
+// Ensure RTL alignment works.

[msw, 2015/02/23 19:30:07]

nit: Is this really specific to RTL or just multi-line alignment?

[oshima, 2015/02/23 23:06:52]

I added RTL case for assertion purpose, but updated the comment anyway.

+TEST_F(RenderTextTest, Multiline_HorizontalAlignment) {
+  const struct {
+    const wchar_t* const text;
+    const gfx::HorizontalAlignment alignment;
+  } kTestStrings[] = {
+    { L"abcdefghij\nhijkl", gfx::ALIGN_LEFT},

[msw, 2015/02/23 19:30:07]

nit: add spaces before closing curly braces throughout.

[msw, 2015/02/23 19:30:07]

nit: maybe add an english, 2nd line longer case?
(I guess that doesn't affect the tested outcomes...)

[oshima, 2015/02/23 23:06:52]

Done.

[oshima, 2015/02/23 23:06:52]

Done.

+    // hebrew, 2nd line shorter
+    { L"\x5d0\x5d1\x5d2\x5d3\x5d4\x5d5\x5d6\x5d7\n\x5d0\x5d1\x5d2\x5d3",
+      gfx::ALIGN_RIGHT},
+    // hebrew, 2nd line longer
+    { L"\x5d0\x5d1\x5d2\x5d3\n\x5d0\x5d1\x5d2\x5d3\x5d4\x5d5\x5d6\x5d7",
+      gfx::ALIGN_RIGHT},
+    // arabic, 2nd line shorter
+    { L"\x62a\x62b\x62c\x62d\x62e\x62f\x630\n\x660\x661\x662\x663\x664",
+      gfx::ALIGN_RIGHT},
+    // arabic, 2nd line longer
+    { L"\x660\x661\x662\x663\x664\n\x62a\x62b\x62c\x62d\x62e\x62f\x630",
+      gfx::ALIGN_RIGHT},
+  };
+  const int kGlyphSize = 5;
+  RenderTextHarfBuzz render_text;
+  render_text.SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
+  render_text.set_glyph_width_for_test(kGlyphSize);
+  render_text.SetDisplayRect(Rect(100, 1000));
+  render_text.SetMultiline(true);
+
+  Canvas canvas;
+  for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
+    SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "] %ls", i,
+                                    kTestStrings[i].text));
+    render_text.SetText(WideToUTF16(kTestStrings[i].text));
+    render_text.Draw(&canvas);
+    ASSERT_LE(2u, render_text.lines().size());
+    if (kTestStrings[i].alignment == gfx::ALIGN_LEFT) {
+      EXPECT_EQ(0, render_text.GetAlignmentOffset(0).x());
+      EXPECT_EQ(0, render_text.GetAlignmentOffset(1).x());
+    } else {
+      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, 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 396 matching lines @@
       EXPECT_LT(220U, color_utils::GetLuminanceForColor(color)) << string;
       for (int x = 1; x < kTestWidth; ++x) {
         color = buffer[width + x + y * kCanvasSize.width()];
         EXPECT_EQ(SK_ColorWHITE, color) << string;
       }
     }
   }
 }
 
 }  // namespace gfx