Chromium Code Reviews| Index: skia/ext/skia_utils_mac.mm |
| diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm |
| index 6781a93f120df52c358ec6de5eccb60d97817190..95e9c501eede487a1c3c4ae30240458de78e1666 100644 |
| --- a/skia/ext/skia_utils_mac.mm |
| +++ b/skia/ext/skia_utils_mac.mm |
| @@ -186,6 +186,16 @@ CGColorRef SkColorToCGColorRef(SkColor color) { |
| SkColorGetA(color) / 255.0); |
| } |
| +// Converts NSColor to ARGB |
| +SkColor NSColorToSkColor(NSColor* color) { |
| + CGFloat red, green, blue, alpha; |
|
Nico
2012/02/21 19:40:17
DCHECK([color colorSpace] == NSCalibratedRGBColorS
keishi
2012/02/24 14:38:54
Done.
|
| + [color getRed:&red green:&green blue:&blue alpha:&alpha]; |
|
Nico
2012/02/21 19:40:17
Are you sure you don't want to call this NSDeviceC
keishi
2012/02/24 14:38:54
OK. Done.
On 2012/02/21 19:40:17, Nico wrote:
|
| + return SkColorSetARGB(SkScalarRound(255.0 * alpha), |
| + SkScalarRound(255.0 * red), |
| + SkScalarRound(255.0 * green), |
| + SkScalarRound(255.0 * blue)); |
| +} |
| + |
| // Converts ARGB to NSColor. |
| NSColor* SkColorToCalibratedNSColor(SkColor color) { |
| return [NSColor colorWithCalibratedRed:SkColorGetR(color) / 255.0 |
| @@ -194,6 +204,13 @@ NSColor* SkColorToCalibratedNSColor(SkColor color) { |
| alpha:SkColorGetA(color) / 255.0]; |
| } |
| +NSColor* SkColorToDeviceNSColor(SkColor color) { |
| + return [NSColor colorWithDeviceRed:SkColorGetR(color) / 255.0 |
| + green:SkColorGetG(color) / 255.0 |
| + blue:SkColorGetB(color) / 255.0 |
| + alpha:SkColorGetA(color) / 255.0]; |
| +} |
| + |
| SkBitmap CGImageToSkBitmap(CGImageRef image) { |
| if (!image) |
| return SkBitmap(); |