Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: gpu/command_buffer/tests/gl_manager.h

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 4 years, 8 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_manager.h
diff --git a/gpu/command_buffer/tests/gl_manager.h b/gpu/command_buffer/tests/gl_manager.h
index 4819e4c5f5b234fe3787c5165015cfd9fef2b006..993472ba9a42c81be9b608c13244050adfb8a181 100644
--- a/gpu/command_buffer/tests/gl_manager.h
+++ b/gpu/command_buffer/tests/gl_manager.h
@@ -8,9 +8,10 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "gpu/command_buffer/client/gpu_control.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
#include "gpu/command_buffer/service/feature_info.h"
@@ -78,7 +79,7 @@ class GLManager : private GpuControl {
GLManager();
~GLManager() override;
- scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
+ std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
const gfx::Size& size,
gfx::BufferFormat format);
@@ -162,17 +163,17 @@ class GLManager : private GpuControl {
SyncPointManager* sync_point_manager_; // Non-owning.
scoped_refptr<SyncPointOrderData> sync_point_order_data_;
- scoped_ptr<SyncPointClient> sync_point_client_;
+ std::unique_ptr<SyncPointClient> sync_point_client_;
scoped_refptr<gles2::MailboxManager> mailbox_manager_;
scoped_refptr<gfx::GLShareGroup> share_group_;
- scoped_ptr<CommandBufferService> command_buffer_;
- scoped_ptr<gles2::GLES2Decoder> decoder_;
- scoped_ptr<CommandExecutor> executor_;
+ std::unique_ptr<CommandBufferService> command_buffer_;
+ std::unique_ptr<gles2::GLES2Decoder> decoder_;
+ std::unique_ptr<CommandExecutor> executor_;
scoped_refptr<gfx::GLSurface> surface_;
scoped_refptr<gfx::GLContext> context_;
- scoped_ptr<gles2::GLES2CmdHelper> gles2_helper_;
- scoped_ptr<TransferBuffer> transfer_buffer_;
- scoped_ptr<gles2::GLES2Implementation> gles2_implementation_;
+ std::unique_ptr<gles2::GLES2CmdHelper> gles2_helper_;
+ std::unique_ptr<TransferBuffer> transfer_buffer_;
+ std::unique_ptr<gles2::GLES2Implementation> gles2_implementation_;
bool context_lost_allowed_;
bool pause_commands_;
uint32_t paused_order_num_;
« no previous file with comments | « gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698