Uses and returns the fractional width in text eliding

ui/gfx/canvas.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.
 
 #include "ui/gfx/canvas.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 65 matching lines @@
   Size pixel_size = ToFlooredSize(ScaleSize(size, image_scale));
   owned_canvas_ = skia::AdoptRef(skia::CreatePlatformCanvas(pixel_size.width(),
                                                             pixel_size.height(),
                                                             is_opaque));
   canvas_ = owned_canvas_.get();
   SkScalar scale_scalar = SkFloatToScalar(image_scale);
   canvas_->scale(scale_scalar, scale_scalar);
 }
 
 // static
-void Canvas::SizeStringInt(const base::string16& text,
-                           const Font& font,
-                           int* width,
-                           int* height,
-                           int line_height,
-                           int flags) {
-  SizeStringInt(text, FontList(font), width, height, line_height, flags);
+void Canvas::SizeStringToFit(const base::string16& text,
+                             const Font& font,
+                             float* width,
+                             float* height,
+                             int line_height,
+                             int flags) {
+  SizeStringToFit(text, FontList(font), width, height, line_height, flags);
 }
 
 // static
-int Canvas::GetStringWidth(const base::string16& text,
-                           const FontList& font_list) {
-  int width = 0, height = 0;
-  SizeStringInt(text, font_list, &width, &height, 0, NO_ELLIPSIS);
+float Canvas::GetStringWidth(const base::string16& text,
+                             const FontList& font_list) {
+  float width = 0, height = 0;
+  SizeStringToFit(text, font_list, &width, &height, 0, NO_ELLIPSIS);
   return width;
 }
 
 // static
-int Canvas::GetStringWidth(const base::string16& text, const Font& font) {
-  int width = 0, height = 0;
-  SizeStringInt(text, FontList(font), &width, &height, 0, NO_ELLIPSIS);
+float Canvas::GetStringWidth(const base::string16& text, const Font& font) {
+  float width = 0, height = 0;
+  SizeStringToFit(text, FontList(font), &width, &height, 0, NO_ELLIPSIS);
   return width;
 }
 
 // static
 int Canvas::DefaultCanvasTextAlignment() {
   return base::i18n::IsRTL() ? TEXT_ALIGN_RIGHT : TEXT_ALIGN_LEFT;
 }
 
 void Canvas::DrawStringWithHalo(const base::string16& text,
                                 const Font& font,
@@ skipping 493 matching lines @@
 
     float bitmap_scale = image_rep.scale();
     if (scale_x < bitmap_scale || scale_y < bitmap_scale)
       const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap();
   }
 
   return image_rep;
 }
 
 }  // namespace gfx