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

Unified Diff: ui/gfx/image/image_unittest_util_ios.mm

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 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 | « ui/gfx/image/image_unittest_util.cc ('k') | ui/gfx/render_text_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_unittest_util_ios.mm
diff --git a/ui/gfx/image/image_unittest_util_ios.mm b/ui/gfx/image/image_unittest_util_ios.mm
index f2d200d57da4eee67f70734860d000f5e2cbada9..56266178cf010a055ccb0225c1932d7a3509199c 100644
--- a/ui/gfx/image/image_unittest_util_ios.mm
+++ b/ui/gfx/image/image_unittest_util_ios.mm
@@ -14,19 +14,20 @@ namespace test {
SkColor GetPlatformImageColor(PlatformImage image, int x, int y) {
// Start by extracting the target pixel into a 1x1 CGImage.
- base::mac::ScopedCFTypeRef<CGImageRef> pixel_image(
+ base::ScopedCFTypeRef<CGImageRef> pixel_image(
CGImageCreateWithImageInRect(image.CGImage, CGRectMake(x, y, 1, 1)));
// Draw that pixel into a 1x1 bitmap context.
- base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
+ base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
CGColorSpaceCreateDeviceRGB());
- base::mac::ScopedCFTypeRef<CGContextRef> bitmap_context(
- CGBitmapContextCreate(/*data=*/ NULL,
- /*width=*/ 1, /*height=*/ 1,
- /*bitsPerComponent=*/ 8, /*bytesPerRow=*/ 4,
- color_space,
- kCGImageAlphaPremultipliedFirst |
- kCGBitmapByteOrder32Host));
+ base::ScopedCFTypeRef<CGContextRef> bitmap_context(CGBitmapContextCreate(
+ /*data=*/ NULL,
+ /*width=*/ 1,
+ /*height=*/ 1,
+ /*bitsPerComponent=*/ 8,
+ /*bytesPerRow=*/ 4,
+ color_space,
+ kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
CGContextDrawImage(bitmap_context, CGRectMake(0, 0, 1, 1), pixel_image);
// The CGBitmapContext has the same memory layout as SkColor, so we can just
« no previous file with comments | « ui/gfx/image/image_unittest_util.cc ('k') | ui/gfx/render_text_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698