Uses and returns the fractional width in text eliding

ui/message_center/views/bounded_label.cc

 // Copyright 2013 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/message_center/views/bounded_label.h"
 
 #include <limits>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 88 matching lines @@
   return (limit < 0 || lines <= limit) ? lines : limit;
 }
 
 gfx::Size InnerBoundedLabel::GetSizeForWidthAndLines(int width, int lines) {
   if (width == 0 || lines == 0)
     return gfx::Size();
   std::pair<int, int> key(width, lines);
   gfx::Size size = GetCachedSize(key);
   if (size.height() == std::numeric_limits<int>::max()) {
     gfx::Insets insets = owner_->GetInsets();
-    int text_width = (width < 0) ? std::numeric_limits<int>::max() :
-                                   std::max(width - insets.width(), 0);
-    int text_height = std::numeric_limits<int>::max();
+    float text_width = (width < 0) ? std::numeric_limits<int>::max() :
+                                     std::max(width - insets.width(), 0);
+    float text_height = std::numeric_limits<int>::max();
     std::vector<string16> wrapped = GetWrappedText(text_width, lines);
-    gfx::Canvas::SizeStringInt(JoinString(wrapped, '\n'), font(),
-                               &text_width, &text_height,
-                               owner_->GetLineHeight(),
-                               GetTextFlags());
+    gfx::Canvas::SizeStringToFit(JoinString(wrapped, '\n'), font(),
+                                 &text_width, &text_height,
+                                 owner_->GetLineHeight(),
+                                 GetTextFlags());
     size.set_width(text_width + insets.width());
     size.set_height(text_height + insets.height());
     SetCachedSize(key, size);
   }
   return size;
 }
 
 std::vector<string16> InnerBoundedLabel::GetWrappedText(int width, int lines) {
   // Short circuit simple case.
   if (width == 0 || lines == 0)
     return std::vector<string16>();
 
   // Restrict line limit to ensure (lines + 1) * line_height <= INT_MAX and
   // use it to calculate a reasonable text height.
   int height = std::numeric_limits<int>::max();
   if (lines > 0) {
     int line_height = std::max(font().GetHeight(), 2);  // At least 2 pixels.
     int max_lines = std::numeric_limits<int>::max() / line_height - 1;
     lines = std::min(lines, max_lines);
     height = (lines + 1) * line_height;
   }
 
+  // If |width| is -1, it means no wrapping.
+  float wrap_width = (width < 0) ? FLT_MAX : width;
+
   // Try to ensure that the width is no smaller than the width of the text's
   // characters to avoid the http://crbug.com/237700 infinite loop.
   // TODO(dharcourt): Remove when http://crbug.com/237700 is fixed.
-  width = std::max(width, 2 * font().GetStringWidth(UTF8ToUTF16("W")));
+  wrap_width =
+      std::max(wrap_width, 2 * font().GetStringWidth(UTF8ToUTF16("W")));
 
-  // Wrap, using INT_MAX for -1 widths that indicate no wrapping.
+  // Wrap the text.
   std::vector<string16> wrapped;
-  gfx::ElideRectangleText(text(), font_list(),
-                          (width < 0) ? std::numeric_limits<int>::max() : width,
+  gfx::ElideRectangleText(text(), font_list(), wrap_width,
                           height, gfx::WRAP_LONG_WORDS, &wrapped);
 
   // Elide if necessary.
   if (lines > 0 && wrapped.size() > static_cast<unsigned int>(lines)) {
     // Add an ellipsis to the last line. If this ellipsis makes the last line
     // too wide, that line will be further elided by the gfx::ElideText below,
     // so for example "ABC" could become "ABC..." and then "AB...".
     string16 last = wrapped[lines - 1] + UTF8ToUTF16(gfx::kEllipsis);
     if (width > 0 && font().GetStringWidth(last) > width)
       last = gfx::ElideText(last, font(), width, gfx::ELIDE_AT_END);
@@ skipping 180 matching lines @@
 
 void BoundedLabel::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   label_->SetNativeTheme(theme);
 }
 
 string16 BoundedLabel::GetWrappedTextForTest(int width, int lines) {
   return JoinString(label_->GetWrappedText(width, lines), '\n');
 }
 
 }  // namespace message_center