Uses and returns the fractional width in text eliding

ui/views/controls/label.cc

Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 7d4bc7e84703c03dfcbb50ed1f231e991e3b7590..264a7e967fb474a635fb648eaa3028704ae0b3f7 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -189,7 +189,9 @@ void Label::SizeToFit(int max_width) {
   int label_width = 0;
   for (std::vector<string16>::const_iterator iter = lines.begin();
        iter != lines.end(); ++iter) {
-    label_width = std::max(label_width, gfx::GetStringWidth(*iter, font_list_));
+    label_width = std::max(
+        label_width,
+        static_cast<int>(gfx::GetStringWidth(*iter, font_list_)));

[msw, 2013/09/27 21:54:48]

Shouldn't this retain the floating point value? Either way, use
std::max<int|float> instead of static casting an arg, if possible.

[jianli, 2013/10/01 00:32:58]

I do not think fractional width will be needed for those platforms that use
views. Changed to use std::max<int>.

   }
 
   label_width += GetInsets().width();
@@ -249,12 +251,11 @@ int Label::GetHeightForWidth(int w) {
       return s.height() + GetInsets().height();
   }
 
-  int cache_width = w;
-
-  int h = font_list_.GetHeight();
+  float fw = w;

[msw, 2013/09/27 21:54:48]

|fw| isn't really used after its value is updated below, because you changed
line 258 to use |w| instead of |fw|/|cache_width|. Can you clean this code up?

[jianli, 2013/10/01 00:32:58]

Though |fw| is not used  after its value is updated, we still need it since
Canvas::SizeStringToFit needs a float parameter to pass. I changed to use w
instead of cache_width since we do not need to introduce another variable to
cache the old value.

[msw, 2013/10/01 02:42:48]

Ah, now I understand; this code was already caching the argument width instead
of the width value that was potentially increased by SizeStringToFit... this
change is okay since you're retaining the original behavior.

+  float h = font_list_.GetHeight();
   const int flags = ComputeDrawStringFlags();
-  gfx::Canvas::SizeStringInt(text_, font_list_, &w, &h, line_height_, flags);
-  cached_heights_[cached_heights_cursor_] = gfx::Size(cache_width, h);
+  gfx::Canvas::SizeStringInt(text_, font_list_, &fw, &h, line_height_, flags);
+  cached_heights_[cached_heights_cursor_] = gfx::Size(w, h);
   cached_heights_cursor_ = (cached_heights_cursor_ + 1) % kCachedSizeLimit;
   return h + GetInsets().height();
 }
@@ -331,9 +332,9 @@ gfx::Size Label::GetTextSize() const {
     // while adding NO_ELLIPSIS to the flags works on Windows for forcing
     // SizeStringInt() to calculate the desired width, it doesn't seem to work
     // on Linux.
-    int w = is_multi_line_ ?
+    float w = is_multi_line_ ?
         GetAvailableRect().width() : std::numeric_limits<int>::max();
-    int h = font_list_.GetHeight();
+    float h = font_list_.GetHeight();
     // For single-line strings, ignore the available width and calculate how
     // wide the text wants to be.
     int flags = ComputeDrawStringFlags();