Index: ui/gfx/render_text_harfbuzz.cc |
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc |
index 47d55ee97f0fbbc69368ecda7910e71b3df2e6ff..f33a5ed7a43cbd5f134d03fcf309f23cb2a214bb 100644 |
--- a/ui/gfx/render_text_harfbuzz.cc |
+++ b/ui/gfx/render_text_harfbuzz.cc |
@@ -782,11 +782,9 @@ bool RenderTextHarfBuzz::MultilineSupported() const { |
} |
const base::string16& RenderTextHarfBuzz::GetDisplayText() { |
- // TODO(oshima): Consider supporting eliding multi-line text. |
- // This requires max_line support first. |
- if (multiline() || |
- elide_behavior() == NO_ELIDE || |
- elide_behavior() == FADE_TAIL) { |
+ // TODO(krb): Consider other elision modes for multiline. |
+ if ((multiline() && (max_lines() == 0 || elide_behavior() != ELIDE_TAIL)) || |
+ elide_behavior() == NO_ELIDE || elide_behavior() == FADE_TAIL) { |
// Call UpdateDisplayText to clear |display_text_| and |text_elided_| |
// on the RenderText class. |
UpdateDisplayText(0); |