2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index de3efd2..c193946 100644
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -96,6 +96,7 @@ WebGraphicsContext3DInProcessCommandBufferImpl::
       window_(window),
       initialized_(false),
       initialize_failed_(false),
+      context_(NULL),
       gl_(NULL),
       context_lost_callback_(NULL),
       context_lost_reason_(GL_NO_ERROR),
@@ -148,7 +149,7 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::MaybeInitializeGL() {
       base::Bind(&WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost,
                  base::Unretained(this));
 
-  context_.reset(GLInProcessContext::CreateContext(
+  context_ = GLInProcessContext::CreateContext(
       is_offscreen_,
       window_,
       gfx::Size(1, 1),
@@ -156,7 +157,7 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::MaybeInitializeGL() {
       preferred_extensions,
       attribs,
       gpu_preference,
-      context_lost_callback));
+      context_lost_callback);
 
   if (!context_) {
     initialize_failed_ = true;
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index 9f65bf3..bb4f3da 100644
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -563,7 +563,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
   bool initialize_failed_;
 
   // The context we use for OpenGL rendering.
-  scoped_ptr< ::gpu::GLInProcessContext> context_;
+  ::gpu::GLInProcessContext* context_;
   // The GLES2Implementation we use for OpenGL rendering.
   ::gpu::gles2::GLES2Implementation* gl_;