Index: skia/ext/skia_utils_mac.mm |
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm |
index 6a624a8e69a0f06352dcd58e37d4e6a6cd8a76e7..5ba161bab7e814b2311c8465a2d850097cdec11d 100644 |
--- a/skia/ext/skia_utils_mac.mm |
+++ b/skia/ext/skia_utils_mac.mm |
@@ -151,7 +151,8 @@ CGColorRef CGColorCreateFromSkColor(SkColor color) { |
// Converts NSColor to ARGB |
SkColor NSDeviceColorToSkColor(NSColor* color) { |
DCHECK([color colorSpace] == [NSColorSpace genericRGBColorSpace] || |
- [color colorSpace] == [NSColorSpace deviceRGBColorSpace]); |
+ [color colorSpace] == [NSColorSpace deviceRGBColorSpace]) |
+ << [[color colorSpace] localizedName]; |
CGFloat red, green, blue, alpha; |
color = [color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; |
[color getRed:&red green:&green blue:&blue alpha:&alpha]; |
@@ -389,7 +390,7 @@ CGContextRef SkiaBitLocker::cgContext() { |
base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( |
CGColorSpaceCreateDeviceRGB()); |
cgContext_ = CGBitmapContextCreate(bitmap_.getPixels(), bitmap_.width(), |
- bitmap_.height(), 8, bitmap_.rowBytes(), colorSpace, |
+ bitmap_.height(), 8, bitmap_.rowBytes(), colorSpace, |
kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst); |
// Apply device matrix. |
@@ -430,7 +431,7 @@ CGContextRef SkiaBitLocker::cgContext() { |
skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY)); |
CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix); |
CGContextConcatCTM(cgContext_, affine); |
- |
+ |
return cgContext_; |
} |