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

Side by Side Diff: ppapi/proxy/ppapi_command_buffer_proxy.h

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nullptr 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 5 #ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
6 #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 6 #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory>
12
11 #include "base/callback.h" 13 #include "base/callback.h"
12 #include "base/containers/hash_tables.h" 14 #include "base/containers/hash_tables.h"
13 #include "base/macros.h" 15 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "gpu/command_buffer/client/gpu_control.h" 16 #include "gpu/command_buffer/client/gpu_control.h"
16 #include "gpu/command_buffer/common/command_buffer.h" 17 #include "gpu/command_buffer/common/command_buffer.h"
17 #include "gpu/command_buffer/common/command_buffer_id.h" 18 #include "gpu/command_buffer/common/command_buffer_id.h"
18 #include "gpu/command_buffer/common/command_buffer_shared.h" 19 #include "gpu/command_buffer/common/command_buffer_shared.h"
19 #include "ppapi/proxy/plugin_dispatcher.h" 20 #include "ppapi/proxy/plugin_dispatcher.h"
20 #include "ppapi/proxy/ppapi_proxy_export.h" 21 #include "ppapi/proxy/ppapi_proxy_export.h"
21 #include "ppapi/shared_impl/host_resource.h" 22 #include "ppapi/shared_impl/host_resource.h"
22 23
23 namespace IPC { 24 namespace IPC {
24 class Message; 25 class Message;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 88
88 // The shared memory area used to update state. 89 // The shared memory area used to update state.
89 gpu::CommandBufferSharedState* shared_state() const; 90 gpu::CommandBufferSharedState* shared_state() const;
90 91
91 void FlushInternal(); 92 void FlushInternal();
92 93
93 const gpu::CommandBufferId command_buffer_id_; 94 const gpu::CommandBufferId command_buffer_id_;
94 95
95 gpu::Capabilities capabilities_; 96 gpu::Capabilities capabilities_;
96 State last_state_; 97 State last_state_;
97 scoped_ptr<base::SharedMemory> shared_state_shm_; 98 std::unique_ptr<base::SharedMemory> shared_state_shm_;
98 99
99 HostResource resource_; 100 HostResource resource_;
100 PluginDispatcher* dispatcher_; 101 PluginDispatcher* dispatcher_;
101 102
102 base::Closure channel_error_callback_; 103 base::Closure channel_error_callback_;
103 104
104 InstanceData::FlushInfo *flush_info_; 105 InstanceData::FlushInfo *flush_info_;
105 106
106 uint64_t next_fence_sync_release_; 107 uint64_t next_fence_sync_release_;
107 uint64_t pending_fence_sync_release_; 108 uint64_t pending_fence_sync_release_;
108 uint64_t flushed_fence_sync_release_; 109 uint64_t flushed_fence_sync_release_;
109 uint64_t validated_fence_sync_release_; 110 uint64_t validated_fence_sync_release_;
110 111
111 DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy); 112 DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy);
112 }; 113 };
113 114
114 } // namespace proxy 115 } // namespace proxy
115 } // namespace ppapi 116 } // namespace ppapi
116 117
117 #endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 118 #endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_resource_tracker_unittest.cc ('k') | ppapi/proxy/ppapi_command_buffer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698