skia/ext/skia_utils_mac.mm - Issue 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/ext/skia_utils_mac.mm

Issue 3855001: Move scoped_cftyperef from base to base/mac, use the new namespace, and name ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 10 years, 2 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

Index: skia/ext/skia_utils_mac.mm

===================================================================

--- skia/ext/skia_utils_mac.mm (revision 62861)

+++ skia/ext/skia_utils_mac.mm (working copy)

@@ -7,7 +7,7 @@

#import <AppKit/AppKit.h>

#include "base/logging.h"

-#include "base/scoped_cftyperef.h"

+#include "base/mac/scoped_cftyperef.h"

#include "base/scoped_ptr.h"

#include "skia/ext/bitmap_platform_device_mac.h"

#include "third_party/skia/include/utils/mac/SkCGUtils.h"

@@ -123,7 +123,7 @@

bitmap.setIsOpaque(is_opaque);

- scoped_cftyperef<CGColorSpaceRef> color_space(

+ base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(

CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));

void* data = bitmap.getPixels();

@@ -133,7 +133,7 @@

(SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \

&& SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))

#if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0)

- scoped_cftyperef<CGContextRef> context(

+ base::mac::ScopedCFTypeRef<CGContextRef> context(

CGBitmapContextCreate(data, size.width, size.height, 8, size.width*4,

color_space,

kCGImageAlphaPremultipliedFirst |

« no previous file with comments | « printing/printing_context_mac.mm ('k') | webkit/glue/plugins/pepper_graphics_2d.cc » ('j') | no next file with comments »