Implement eliding/truncating at end 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 ffa19174d28c18fa9a3b70e4a512778253a4d318..b63255301f11429f80c48193bc285de6980c33a2 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -400,6 +400,77 @@ TEST_F(RenderTextTest, RevealObscuredText) {
   EXPECT_EQ(valid_expect_5_and_6, render_text->GetLayoutText());
 }
 
+TEST_F(RenderTextTest, ElidedText) {
+  // TODO(skanuj) : Add more test cases for following
+  // - RenderText styles.
+  // - Cross interaction of truncate, elide and obscure.
+  // - ElideText tests from text_elider.cc.
+  struct {
+    const wchar_t* text;
+    const wchar_t* layout_text;
+  } cases[] = {
+    // Strings shorter than the elision width should be laid out in full.
+    { L""        , L""        },

[msw, 2013/12/13 03:20:05]

I actually wanted the opposite of this, but it's not worth your time to change.

+    { kWeak      , kWeak      },
+    { kLtr       , kLtr       },
+    { kLtrRtl    , kLtrRtl    },
+    { kLtrRtlLtr , kLtrRtlLtr },
+    { kRtl       , kRtl       },
+    { kRtlLtr    , kRtlLtr    },
+    { kRtlLtrRtl , kRtlLtrRtl },
+    // Strings as long as the elision width should be laid out in full.
+    { L"012ab",   L"012ab"   },
+    // Long strings should be elided with an ellipsis appended at the end.
+    { L"012" L"abc"                  , L"012a\x2026"               },
+    { L"012" L"ab" L"\x5d0\x5d1"     , L"012a\x2026"               },
+    { L"012" L"a" L"\x5d1" L"b"      , L"012a\x2026"               },
+    { L"01" L"\x5d0\x5d1\x5d2" L"ab" , L"01\x5d0\x5d1\x2026"       },
+    { L"ab" L"\x5d0\x5d1\x5d2" L"ab" , L"ab\x5d0\x5d1\x2026\x200f" },
+    // Surrogate pairs should be elided reasonably enough.
+    { L"0123\x0915\x093f" L"abcd"          , L"0123\x0915\x2026"          },
+    { L"0\x05e9\x05bc\x05c1\x05b8"         , L"0\x05e9\x05bc\x05c1\x05b8" },
+    { L"0\x05e9\x05bc\x05c1\x05b8" L"ab"   , L"0\x05e9\x05bc\x2026"       },
+    { L"01\x05e9\x05bc\x05c1\x05b8" L"ab"  , L"01\x05e9\x2026"            },
+    { L"012\x05e9\x05bc\x05c1\x05b8" L"ab" , L"012\x2026"                 },
+    { L"012\xF0\x9D\x84\x9E"               , L"012\xF0\x2026"             },
+  };
+
+  scoped_ptr<RenderText> expected_render_text(RenderText::CreateInstance());
+  expected_render_text->SetFontList(FontList("serif, Sans serif, 12px"));
+  expected_render_text->SetDisplayRect(gfx::Rect(0, 0, 9999, 100));
+
+  scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
+  render_text->SetFontList(FontList("serif, Sans serif, 12px"));
+  render_text->SetElideBehavior(gfx::ELIDE_AT_END);
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
+    expected_render_text->SetText(WideToUTF16(cases[i].layout_text));
+    render_text->SetDisplayRect(
+        gfx::Rect(0, 0, expected_render_text->GetContentWidth(), 100));
+    render_text->SetText(WideToUTF16(cases[i].text));
+    EXPECT_EQ(WideToUTF16(cases[i].text), render_text->text());
+    EXPECT_EQ(WideToUTF16(cases[i].layout_text), render_text->GetLayoutText())
+        << "->For case " << i << ": " << cases[i].text << "\n";
+    expected_render_text->SetText(base::string16());
+  }
+}
+
+TEST_F(RenderTextTest, ElidedObscuredText) {
+  scoped_ptr<RenderText> expected_render_text(RenderText::CreateInstance());
+  expected_render_text->SetFontList(FontList("serif, Sans serif, 12px"));
+  expected_render_text->SetDisplayRect(gfx::Rect(0, 0, 9999, 100));
+  expected_render_text->SetText(WideToUTF16(L"**\x2026"));
+
+  scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
+  render_text->SetFontList(FontList("serif, Sans serif, 12px"));
+  render_text->SetElideBehavior(gfx::ELIDE_AT_END);
+  render_text->SetDisplayRect(
+      gfx::Rect(0, 0, expected_render_text->GetContentWidth(), 100));
+  render_text->SetObscured(true);
+  render_text->SetText(WideToUTF16(L"abcdef"));
+  EXPECT_EQ(WideToUTF16(L"abcdef"), render_text->text());
+  EXPECT_EQ(WideToUTF16(L"**\x2026"), render_text->GetLayoutText());
+}
+
 TEST_F(RenderTextTest, TruncatedText) {
   struct {
     const wchar_t* text;