app/clipboard/clipboard_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: app/clipboard/clipboard_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: app/clipboard/clipboard_mac.mm

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

--- app/clipboard/clipboard_mac.mm (revision 62861)

+++ app/clipboard/clipboard_mac.mm (working copy)

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

#include "base/file_path.h"

#include "base/logging.h"

#include "base/mac_util.h"

-#include "base/scoped_cftyperef.h"

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

#include "base/scoped_nsobject.h"

#include "base/sys_string_conversions.h"

#include "base/utf_string_conversions.h"

@@ -105,16 +105,16 @@

const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data);

// Safe because the image goes away before the call returns.

- scoped_cftyperef<CFDataRef> data(

+ base::win::ScopedCFTypeRef<CFDataRef> data(

CFDataCreateWithBytesNoCopy(kCFAllocatorDefault,

reinterpret_cast<const UInt8*>(pixel_data),

size->width()*size->height()*4,

kCFAllocatorNull));

- scoped_cftyperef<CGDataProviderRef> data_provider(

+ base::win::ScopedCFTypeRef<CGDataProviderRef> data_provider(

CGDataProviderCreateWithCFData(data));

- scoped_cftyperef<CGImageRef> cgimage(

+ base::win::ScopedCFTypeRef<CGImageRef> cgimage(

CGImageCreate(size->width(),

size->height(),

« no previous file with comments | « no previous file | app/surface/accelerated_surface_mac.h » ('j') | no next file with comments »