Index: gpu/command_buffer/service/command_buffer_service.h |
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h |
index 560bf163326fcfcdfcfc3ba98e61bd39b3cd0bf4..df058767b07f8b55466a304577fe641a1803ac2c 100644 |
--- a/gpu/command_buffer/service/command_buffer_service.h |
+++ b/gpu/command_buffer/service/command_buffer_service.h |
@@ -8,6 +8,8 @@ |
#include <stddef.h> |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/callback.h" |
#include "base/macros.h" |
#include "gpu/command_buffer/common/command_buffer.h" |
@@ -85,19 +87,20 @@ class GPU_EXPORT CommandBufferService : public CommandBufferServiceBase { |
virtual void SetParseErrorCallback(const base::Closure& callback); |
// Setup the shared memory that shared state should be copied into. |
- void SetSharedStateBuffer(scoped_ptr<BufferBacking> shared_state_buffer); |
+ void SetSharedStateBuffer(std::unique_ptr<BufferBacking> shared_state_buffer); |
// Copy the current state into the shared state transfer buffer. |
void UpdateState(); |
// Registers an existing shared memory object and get an ID that can be used |
// to identify it in the command buffer. |
- bool RegisterTransferBuffer(int32_t id, scoped_ptr<BufferBacking> buffer); |
+ bool RegisterTransferBuffer(int32_t id, |
+ std::unique_ptr<BufferBacking> buffer); |
private: |
int32_t ring_buffer_id_; |
scoped_refptr<Buffer> ring_buffer_; |
- scoped_ptr<BufferBacking> shared_state_buffer_; |
+ std::unique_ptr<BufferBacking> shared_state_buffer_; |
CommandBufferSharedState* shared_state_; |
int32_t num_entries_; |
int32_t get_offset_; |