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

Unified Diff: skia/ext/skia_utils_mac.mm

Issue 187483005: Extending the Views-on-Mac experiment: whole app list grid. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: still compiles r263560 + crrev/195793005 Created 6 years, 8 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 | « chrome/browser/ui/app_list/app_list_controller_browsertest.cc ('k') | ui/app_list/DEPS » ('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 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_;
}
« no previous file with comments | « chrome/browser/ui/app_list/app_list_controller_browsertest.cc ('k') | ui/app_list/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698