Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Unified Diff: skia/ext/skia_utils_mac.mm

Issue 122443005: replace deprecated SkScalarRound/Floor/Ceil calls with more explicit variants (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/opacity_draw_filter.cc ('k') | skia/ext/skia_utils_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/skia_utils_mac.mm
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index dcc2cccffc6b43f5a1fdaca3fab4d54dede18f99..6a624a8e69a0f06352dcd58e37d4e6a6cd8a76e7 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -134,10 +134,10 @@ CGRect SkRectToCGRect(const SkRect& rect) {
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.
@@ -155,10 +155,10 @@ SkColor NSDeviceColorToSkColor(NSColor* color) {
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.
« no previous file with comments | « skia/ext/opacity_draw_filter.cc ('k') | skia/ext/skia_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698