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

skia/ext/skia_utils_mac.mm

 // 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 "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 116 matching lines @@
     { rect.fLeft, rect.fTop },
     { rect.fRight - rect.fLeft, rect.fBottom - rect.fTop }
   };
   return cg_rect;
 }
 
 // Converts CGColorRef to the ARGB layout Skia expects.
 SkColor CGColorRefToSkColor(CGColorRef color) {
   DCHECK(CGColorGetNumberOfComponents(color) == 4);
   const CGFloat* components = CGColorGetComponents(color);
-  return SkColorSetARGB(SkScalarRound(255.0 * components[3]), // alpha
-                        SkScalarRound(255.0 * components[0]), // red
-                        SkScalarRound(255.0 * components[1]), // green
-                        SkScalarRound(255.0 * components[2])); // blue
+  return SkColorSetARGB(SkScalarRoundToInt(255.0 * components[3]), // alpha
+                        SkScalarRoundToInt(255.0 * components[0]), // red
+                        SkScalarRoundToInt(255.0 * components[1]), // green
+                        SkScalarRoundToInt(255.0 * components[2])); // blue
 }
 
 // Converts ARGB to CGColorRef.
 CGColorRef CGColorCreateFromSkColor(SkColor color) {
   return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0,
                                  SkColorGetG(color) / 255.0,
                                  SkColorGetB(color) / 255.0,
                                  SkColorGetA(color) / 255.0);
 }
 
 // Converts NSColor to ARGB
 SkColor NSDeviceColorToSkColor(NSColor* color) {
   DCHECK([color colorSpace] == [NSColorSpace genericRGBColorSpace] ||
          [color colorSpace] == [NSColorSpace deviceRGBColorSpace]);
   CGFloat red, green, blue, alpha;
   color = [color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
   [color getRed:&red green:&green blue:&blue alpha:&alpha];
-  return SkColorSetARGB(SkScalarRound(255.0 * alpha),
-                        SkScalarRound(255.0 * red),
-                        SkScalarRound(255.0 * green),
-                        SkScalarRound(255.0 * blue));
+  return SkColorSetARGB(SkScalarRoundToInt(255.0 * alpha),
+                        SkScalarRoundToInt(255.0 * red),
+                        SkScalarRoundToInt(255.0 * green),
+                        SkScalarRoundToInt(255.0 * blue));
 }
 
 // Converts ARGB to NSColor.
 NSColor* SkColorToCalibratedNSColor(SkColor color) {
   return [NSColor colorWithCalibratedRed:SkColorGetR(color) / 255.0
                                    green:SkColorGetG(color) / 255.0
                                     blue:SkColorGetB(color) / 255.0
                                    alpha:SkColorGetA(color) / 255.0];
 }
 
@@ skipping 256 matching lines @@
   // Apply content matrix.
   SkMatrix skMatrix = canvas_->getTotalMatrix();
   skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
   CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
   CGContextConcatCTM(cgContext_, affine);
   
   return cgContext_;
 }
 
 }  // namespace gfx