Type conversion fixes, text rendering edition.

ui/gfx/text_elider.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.
 //
 // This file implements utility functions for eliding and formatting UI text.
 //
 // Note that several of the functions declared in text_elider.h are implemented
 // in this file using helper classes in an unnamed namespace.
 
 #include "ui/gfx/text_elider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/char_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 using base::WideToUTF16;
 
 namespace gfx {
 
 namespace {
@@ skipping 167 matching lines @@
                          ElideBehavior behavior) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   DCHECK_NE(behavior, FADE_TAIL);
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
   render_text->SetCursorEnabled(false);
   // Do not bother accurately sizing strings over 5000 characters here, for
   // performance purposes. This matches the behavior of Canvas::SizeStringFloat.
   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://codereview.chromium.org/631363002> and Cem's recent test
<codereview.chromium.org/652573002>.

I guess your current ToEnclosedRect use matches the pre-existing implicit
float->int cast behavior (floor), right? On the other hand ToEnclosingRect seems
better for now, so that eliding with the exact float witdh of text doesn't cause
any actual elision? (seems like that case was handled by Dan's recent fix)

[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();
 #else
   DCHECK_NE(behavior, FADE_TAIL);
   if (text.empty() || behavior == FADE_TAIL || behavior == NO_ELIDE ||
       GetStringWidthF(text, font_list) <= available_pixel_width) {
     return text;
   }
   if (behavior == ELIDE_EMAIL)
@@ skipping 590 matching lines @@
     index = char_iterator.getIndex();
   } else {
     // String has leading whitespace, return the elide string.
     return kElideString;
   }
 
   return string.substr(0, index) + kElideString;
 }
 
 }  // namespace gfx