Chromium Code Reviews| Index: ui/gfx/text_elider.cc |
| diff --git a/ui/gfx/text_elider.cc b/ui/gfx/text_elider.cc |
| index 279e5cb3be87ff3142647f3f3ab5d15fde476f97..f1aa1e66f26893f3c0e8c6448555c1cdbe319b50 100644 |
| --- a/ui/gfx/text_elider.cc |
| +++ b/ui/gfx/text_elider.cc |
| @@ -24,6 +24,7 @@ |
| #include "third_party/icu/source/common/unicode/rbbi.h" |
| #include "third_party/icu/source/common/unicode/uloc.h" |
| #include "ui/gfx/font_list.h" |
| +#include "ui/gfx/geometry/rect_conversions.h" |
| #include "ui/gfx/render_text.h" |
| #include "ui/gfx/text_utils.h" |
| @@ -211,7 +212,9 @@ base::string16 ElideText(const base::string16& text, |
| render_text->set_truncate_length(5000); |
| render_text->SetFontList(font_list); |
| available_pixel_width = std::ceil(available_pixel_width); |
| - render_text->SetDisplayRect(gfx::Rect(gfx::Size(available_pixel_width, 1))); |
| + // !!! Should this be ToEnclosingRect? |
|
msw
2014/10/17 22:13:23
This seems related to Dan's recent fix <https://co
Peter Kasting
2014/10/21 01:20:46
OK, I'll use ToEnclosingRect().
|
| + render_text->SetDisplayRect( |
| + gfx::ToEnclosedRect(gfx::RectF(gfx::SizeF(available_pixel_width, 1)))); |
| render_text->SetElideBehavior(behavior); |
| render_text->SetText(text); |
| return render_text->layout_text(); |