webkit/glue/plugins/pepper_plugin_instance.cc - 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: webkit/glue/plugins/pepper_plugin_instance.cc

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: webkit/glue/plugins/pepper_plugin_instance.cc

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

--- webkit/glue/plugins/pepper_plugin_instance.cc (revision 62861)

+++ webkit/glue/plugins/pepper_plugin_instance.cc (working copy)

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

#include "base/metrics/histogram.h"

#if defined(OS_MACOSX)

#include "base/mac_util.h"

-#include "base/scoped_cftyperef.h"

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

#endif

#include "base/scoped_ptr.h"

#include "base/utf_string_conversions.h"

@@ -1027,11 +1027,11 @@

int canvas_height) {

SkAutoLockPixels lock(bitmap);

DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);

- scoped_cftyperef<CGDataProviderRef> data_provider(

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

CGDataProviderCreateWithData(

NULL, bitmap.getAddr32(0, 0),

bitmap.rowBytes() * bitmap.height(), NULL));

- scoped_cftyperef<CGImageRef> image(

+ base::mac::ScopedCFTypeRef<CGImageRef> image(

CGImageCreate(

bitmap.width(), bitmap.height(),

8, 32, bitmap.rowBytes(),

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