[Omnibox] Elide omnibox text

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 <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 516 matching lines @@
                         const Font& font,
                         const FontRenderParams& params,
                         internal::TextRunHarfBuzz* run) {
     return GetRenderTextHarfBuzz()->ShapeRunWithFont(text, font, params, run);
   }
 
   int GetCursorYForTesting(int line_num = 0) {
     return GetRenderText()->GetLineOffset(line_num).y() + 1;
   }
 
+  void EnsureLayoutRunList() { GetRenderTextHarfBuzz()->EnsureLayoutRunList(); }

[msw, 2017/04/18 17:23:44]

nit: remove this, just call |test_api()->EnsureLayout()|, like many other
places. (The harfbuzz-specific internal EnsureLayoutRunList is the first thing
that RenderTextHarfBuzz does as part of the more public api, EnsureLayout)

[simonhong, 2017/04/18 19:56:02]

For emptiness test, this is added. When EnsureLayout() used, new |lines_| are
constructed.
Should I find other test way for removing this?

[msw, 2017/04/18 20:13:02]

Oh, hmm... I suppose this is okay, but it would also probably be okay to just
skip adding these tests... Add a comment that says something like "Do not use
this function to ensure layout. This is only used to run a subset of the
EnsureLayout functionality and check intermediate state."

+
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzzTest);
 };
 
 #if defined(OS_MACOSX)
 // Test fixture class. Use for tests which are only to be run for RenderTextMac.
 class RenderTextMacTest : public RenderTextTest {
  public:
   RenderTextMacTest() {}
 
@@ skipping 3409 matching lines @@
             static_cast<size_t>(CTLineGetGlyphCount(GetCoreTextLine())));
 
   render_text->SetElideBehavior(ELIDE_TAIL);
   string_size.set_width(string_size.width() / 2);
   render_text->SetDisplayRect(Rect(string_size));
   test_api()->EnsureLayout();
   CFIndex glyph_count = CTLineGetGlyphCount(GetCoreTextLine());
   EXPECT_GT(text.size(), static_cast<size_t>(glyph_count));
   EXPECT_NE(0, glyph_count);
 }
+
+TEST_P(RenderTextMacTest, LinesInvalidationOnElideBehaviorChange) {
+  RenderTextMac* render_text = GetRenderTextMac();
+  render_text->SetText(ASCIIToUTF16("This is an example"));
+  test_api()->EnsureLayout();
+  EXPECT_TRUE(GetCoreTextLine());
+
+  // Lines are cleared when elide behavior changes.
+  render_text->SetElideBehavior(gfx::ELIDE_TAIL);
+  EXPECT_FALSE(GetCoreTextLine());
+}
 #endif  // defined(OS_MACOSX)
 
 // Ensure color changes are picked up by the RenderText implementation.
 TEST_P(RenderTextTest, ColorChange) {
   RenderText* render_text = GetRenderText();
   render_text->SetText(ASCIIToUTF16("x"));
   DrawVisualText();
 
   std::vector<TestSkiaTextRenderer::TextLog> text_log;
   renderer()->GetTextLogAndReset(&text_log);
@@ skipping 426 matching lines @@
 #endif
   const std::string font_name = "invalid_font";
   const int kFontSize = 13;
   RenderText* render_text = GetRenderText();
   render_text->SetFontList(FontList(Font(font_name, kFontSize)));
   render_text->SetText(ASCIIToUTF16("abc"));
 
   DrawVisualText();
 }
 
+TEST_P(RenderTextHarfBuzzTest, LinesInvalidationOnElideBehaviorChange) {
+  RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
+  render_text->SetText(ASCIIToUTF16("This is an example"));
+  test_api()->EnsureLayout();
+  EXPECT_FALSE(test_api()->lines().empty());
+
+  // Lines are cleared when elide behavior changes.
+  render_text->SetElideBehavior(gfx::ELIDE_TAIL);
+  EnsureLayoutRunList();
+  EXPECT_TRUE(test_api()->lines().empty());
+}
+
 // Ensures that text is centered vertically and consistently when either the
 // display rectangle height changes, or when the minimum line height changes.
 // The difference between the two is the selection rectangle, which should match
 // the line height.
 TEST_P(RenderTextHarfBuzzTest, BaselineWithLineHeight) {
   RenderText* render_text = GetRenderText();
   const int font_height = render_text->font_list().GetHeight();
   render_text->SetDisplayRect(Rect(500, font_height));
   render_text->SetText(ASCIIToUTF16("abc"));
 
@@ skipping 99 matching lines @@
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 #endif
 
 INSTANTIATE_TEST_CASE_P(,
                         RenderTextHarfBuzzTest,
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 
 }  // namespace gfx