Type conversion fixes, text rendering edition.

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 <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 74 matching lines @@
   canvas_->scale(scale_scalar, scale_scalar);
 }
 
 // static
 void Canvas::SizeStringInt(const base::string16& text,
                            const FontList& font_list,
                            int* width,
                            int* height,
                            int line_height,
                            int flags) {
-  float fractional_width = *width;
-  float factional_height = *height;
+  float fractional_width = static_cast<float>(*width);
+  float factional_height = static_cast<float>(*height);
   SizeStringFloat(text, font_list, &fractional_width,
                   &factional_height, line_height, flags);
-  *width = std::ceil(fractional_width);
-  *height = std::ceil(factional_height);
+  *width = ToCeiledInt(fractional_width);
+  *height = ToCeiledInt(factional_height);
 }
 
 // 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);
   return width;
 }
 
@@ skipping 523 matching lines @@
   SkPaint p(paint);
   p.setFilterLevel(filter ? SkPaint::kLow_FilterLevel
                           : SkPaint::kNone_FilterLevel);
   p.setShader(shader.get());
 
   // The rect will be filled by the bitmap.
   canvas_->drawRect(dest_rect, p);
 }
 
 }  // namespace gfx