gfx/canvas_skia_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: gfx/canvas_skia_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: gfx/canvas_skia_mac.mm

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

--- gfx/canvas_skia_mac.mm (revision 62861)

+++ gfx/canvas_skia_mac.mm (working copy)

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

#include "gfx/canvas_skia.h"

-#include "base/scoped_cftyperef.h"

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

#include "base/sys_string_conversions.h"

#include "gfx/font.h"

#include "gfx/rect.h"

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

NSAttributedString* ns_string =

[[[NSAttributedString alloc] initWithString:base::SysWideToNSString(text)

attributes:attributes] autorelease];

- scoped_cftyperef<CTFramesetterRef> framesetter(

+ base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter(

CTFramesetterCreateWithAttributedString(

reinterpret_cast<CFAttributedStringRef>(ns_string)));

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

CGMutablePathRef path = CGPathCreateMutable();

CGPathAddRect(path, NULL, text_bounds);

- scoped_cftyperef<CTFrameRef> frame(

+ base::mac::ScopedCFTypeRef<CTFrameRef> frame(

CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));

CTFrameDraw(frame, context);

CGContextRestoreGState(context);

« no previous file with comments | « gfx/blit.cc ('k') | net/base/cert_test_util.cc » ('j') | no next file with comments »