replace deprecated SkScalarRound/Floor/Ceil calls with more explicit variants

chrome/common/badge_util.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 "chrome/common/badge_util.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 91 matching lines @@
   SkPaint* paint = badge_util::GetBadgeTextPaintSingleton();
   paint->setTextSize(SkFloatToScalar(font_size));
   paint->setColor(SK_ColorWHITE);
 
   std::string badge_text = base::UTF16ToUTF8(text);
 
   // See if the text will fit - otherwise use a default.
   SkScalar text_width = paint->measureText(badge_text.c_str(),
                                            badge_text.size());
 
-  if (SkScalarRound(text_width) > (icon.width() - kMinPadding * 2)) {
+  if (SkScalarRoundToInt(text_width) > (icon.width() - kMinPadding * 2)) {
     // String is too large - use the alternate text.
     badge_text = base::UTF16ToUTF8(fallback);
     text_width = paint->measureText(badge_text.c_str(), badge_text.size());
   }
 
   // When centering the text, we need to make sure there are an equal number
   // of pixels on each side as otherwise the text looks off-center. So if the
   // padding would be uneven, clip one pixel off the right side.
   int badge_width = icon.width();
-  if ((SkScalarRound(text_width) % 1) != (badge_width % 1))
+  if ((SkScalarRoundToInt(text_width) % 1) != (badge_width % 1))
     badge_width--;
 
   // Render the badge bitmap and overlay into a canvas.
   scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
       gfx::Size(badge_width, icon.height()), 1.0f, false));
   canvas->DrawImageInt(gfx::ImageSkia::CreateFrom1xBitmap(icon), 0, 0);
 
   // Draw the text overlay centered horizontally and vertically. Skia expects
   // us to specify the lower left coordinate of the text box, which is why we
   // add 'font_size - 1' to the height.
@@ skipping 25 matching lines @@
       background_color = SkColorSetARGB(255, 218, 0, 24);
 
   canvas->Save();
 
   SkPaint* text_paint = badge_util::GetBadgeTextPaintSingleton();
   text_paint->setTextSize(SkFloatToScalar(kTextSize));
   text_paint->setColor(text_color);
 
   // Calculate text width. We clamp it to a max size.
   SkScalar sk_text_width = text_paint->measureText(text.c_str(), text.size());
-  int text_width = std::min(kMaxTextWidth, SkScalarFloor(sk_text_width));
+  int text_width = std::min(kMaxTextWidth, SkScalarFloorToInt(sk_text_width));
 
   // Calculate badge size. It is clamped to a min width just because it looks
   // silly if it is too skinny.
   int badge_width = text_width + kPadding * 2;
   // Force the pixel width of badge to be either odd (if the icon width is odd)
   // or even otherwise. If there is a mismatch you get http://crbug.com/26400.
   if (icon_width != 0 && (badge_width % 2 != icon_width % 2))
     badge_width += 1;
   badge_width = std::max(kBadgeHeight, badge_width);
 
@@ skipping 41 matching lines @@
   canvas->sk_canvas()->drawText(
       text.c_str(), text.size(),
       SkFloatToScalar(rect.x() +
                       static_cast<float>(rect.width() - text_width) / 2),
       SkFloatToScalar(rect.y() + kTextSize + kTopTextPadding),
       *text_paint);
   canvas->Restore();
 }
 
 }  // namespace badge_util