Index: gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h |
diff --git a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h |
index b52673fba2cf3b8e28d4ecea5d1206c5640dcb99..74f2cf7a06db0afe358d7de8dc1328523dc554d6 100644 |
--- a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h |
+++ b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h |
@@ -7,10 +7,10 @@ |
#include <stddef.h> |
+#include <memory> |
#include <vector> |
#include "base/compiler_specific.h" |
-#include "base/memory/scoped_ptr.h" |
#include "gpu/blink/gpu_blink_export.h" |
#include "gpu/blink/webgraphicscontext3d_impl.h" |
#include "gpu/command_buffer/client/gl_in_process_context.h" |
@@ -38,14 +38,14 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl |
kNoLimit = 0, |
}; |
- static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> |
+ static std::unique_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> |
CreateOffscreenContext( |
const gpu::gles2::ContextCreationAttribHelper& attributes, |
bool share_resources); |
- static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> WrapContext( |
- scoped_ptr<::gpu::GLInProcessContext> context, |
- const gpu::gles2::ContextCreationAttribHelper& attributes); |
+ static std::unique_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> |
+ WrapContext(std::unique_ptr<::gpu::GLInProcessContext> context, |
+ const gpu::gles2::ContextCreationAttribHelper& attributes); |
~WebGraphicsContext3DInProcessCommandBufferImpl() override; |
@@ -62,7 +62,7 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl |
private: |
WebGraphicsContext3DInProcessCommandBufferImpl( |
- scoped_ptr<::gpu::GLInProcessContext> context, |
+ std::unique_ptr<::gpu::GLInProcessContext> context, |
const gpu::gles2::ContextCreationAttribHelper& attributes, |
bool share_resources, |
bool is_offscreen, |
@@ -84,7 +84,7 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl |
gfx::AcceleratedWidget window_; |
// The context we use for OpenGL rendering. |
- scoped_ptr< ::gpu::GLInProcessContext> context_; |
+ std::unique_ptr<::gpu::GLInProcessContext> context_; |
// The GLES2Implementation we use for OpenGL rendering. |
::gpu::gles2::GLES2Implementation* real_gl_; |
}; |