content/common/gpu/media/rendering_helper.cc - Issue 168643002: Convert scoped_ptr_malloc -> scoped_ptr, part 1.

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: content/common/gpu/media/rendering_helper.cc

Issue 168643002: Convert scoped_ptr_malloc -> scoped_ptr, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: content/common/gpu/media/rendering_helper.cc

diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc

index e7e825d58ecb79a25f2f4729d74b4a23f36064c9..0ef52ddc78dc79bd4eb30d03ed9e7054b27d18cc 100644

--- a/content/common/gpu/media/rendering_helper.cc

+++ b/content/common/gpu/media/rendering_helper.cc

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

#ifdef GL_VARIANT_GLX

typedef GLXWindow NativeWindowType;

-struct ScopedPtrXFree {

+struct XFreeDeleter {

void operator()(void* x) const { ::XFree(x); }

};

#else // EGL

@@ -124,7 +124,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params,

GL_NONE,

};

int num_fbconfigs;

- scoped_ptr_malloc<GLXFBConfig, ScopedPtrXFree> glx_fb_configs(

+ scoped_ptr<GLXFBConfig, XFreeDeleter> glx_fb_configs(

glXChooseFBConfig(x_display_, DefaultScreen(x_display_), fbconfig_attr,

&num_fbconfigs));

CHECK(glx_fb_configs.get());