summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-09-15 14:24:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-15 21:26:40 +0000
commite68b03e9002692d85a3b6c18130806e3b02dfb2f (patch)
tree65625f954ac50d39f1a1a5d865903899e6b53f64 /content/common
parente0d93099ad182ca1028ddcc99b1f5fe583ee0089 (diff)
downloadchromium_src-e68b03e9002692d85a3b6c18130806e3b02dfb2f.zip
chromium_src-e68b03e9002692d85a3b6c18130806e3b02dfb2f.tar.gz
chromium_src-e68b03e9002692d85a3b6c18130806e3b02dfb2f.tar.bz2
Remove implicit conversions from scoped_refptr to T* in content/common/gpu
This patch was generated by running the rewrite_scoped_refptr clang tool on a ChromeOS build. BUG=110610 Review URL: https://codereview.chromium.org/552273004 Cr-Commit-Position: refs/heads/master@{#294893}
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/media/rendering_helper.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc
index 00e85f9..82fcfa9 100644
--- a/content/common/gpu/media/rendering_helper.cc
+++ b/content/common/gpu/media/rendering_helper.cc
@@ -171,8 +171,8 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params,
gl_surface_ = gfx::GLSurface::CreateViewGLSurface(window_);
gl_context_ = gfx::GLContext::CreateGLContext(
- NULL, gl_surface_, gfx::PreferIntegratedGpu);
- gl_context_->MakeCurrent(gl_surface_);
+ NULL, gl_surface_.get(), gfx::PreferIntegratedGpu);
+ gl_context_->MakeCurrent(gl_surface_.get());
CHECK_GT(params.window_sizes.size(), 0U);
videos_.resize(params.window_sizes.size());
@@ -317,7 +317,7 @@ void RenderingHelper::UnInitialize(base::WaitableEvent* done) {
glDeleteFramebuffersEXT(1, &thumbnails_fbo_id_);
}
- gl_context_->ReleaseCurrent(gl_surface_);
+ gl_context_->ReleaseCurrent(gl_surface_.get());
gl_context_ = NULL;
gl_surface_ = NULL;