OLD | NEW |
---|---|
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 GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ | 5 #ifndef GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ |
6 #define GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ | 6 #define GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <map> | 11 #include <map> |
no sievers
2016/04/05 19:02:42
#include <memory>
Mostyn Bramley-Moore
2016/04/05 21:35:33
Done.
| |
12 #include <queue> | 12 #include <queue> |
13 #include <string> | 13 #include <string> |
14 | 14 |
15 #include "base/callback.h" | 15 #include "base/callback.h" |
16 #include "base/compiler_specific.h" | 16 #include "base/compiler_specific.h" |
17 #include "base/containers/hash_tables.h" | 17 #include "base/containers/hash_tables.h" |
18 #include "base/containers/scoped_ptr_hash_map.h" | 18 #include "base/containers/scoped_ptr_hash_map.h" |
19 #include "base/macros.h" | 19 #include "base/macros.h" |
20 #include "base/memory/ref_counted.h" | 20 #include "base/memory/ref_counted.h" |
21 #include "base/memory/weak_ptr.h" | 21 #include "base/memory/weak_ptr.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
197 | 197 |
198 base::Lock* lock_; | 198 base::Lock* lock_; |
199 | 199 |
200 // Unowned list of DeletionObservers. | 200 // Unowned list of DeletionObservers. |
201 base::ObserverList<DeletionObserver> deletion_observers_; | 201 base::ObserverList<DeletionObserver> deletion_observers_; |
202 | 202 |
203 // The last cached state received from the service. | 203 // The last cached state received from the service. |
204 State last_state_; | 204 State last_state_; |
205 | 205 |
206 // The shared memory area used to update state. | 206 // The shared memory area used to update state. |
207 scoped_ptr<base::SharedMemory> shared_state_shm_; | 207 std::unique_ptr<base::SharedMemory> shared_state_shm_; |
208 | 208 |
209 // |*this| is owned by |*channel_| and so is always outlived by it, so using a | 209 // |*this| is owned by |*channel_| and so is always outlived by it, so using a |
210 // raw pointer is ok. | 210 // raw pointer is ok. |
211 GpuChannelHost* channel_; | 211 GpuChannelHost* channel_; |
212 const gpu::CommandBufferId command_buffer_id_; | 212 const gpu::CommandBufferId command_buffer_id_; |
213 const int32_t route_id_; | 213 const int32_t route_id_; |
214 const int32_t stream_id_; | 214 const int32_t stream_id_; |
215 uint32_t flush_count_; | 215 uint32_t flush_count_; |
216 int32_t last_put_offset_; | 216 int32_t last_put_offset_; |
217 int32_t last_barrier_put_offset_; | 217 int32_t last_barrier_put_offset_; |
(...skipping 27 matching lines...) Expand all Loading... | |
245 | 245 |
246 base::WeakPtr<CommandBufferProxyImpl> weak_this_; | 246 base::WeakPtr<CommandBufferProxyImpl> weak_this_; |
247 scoped_refptr<base::SequencedTaskRunner> callback_thread_; | 247 scoped_refptr<base::SequencedTaskRunner> callback_thread_; |
248 | 248 |
249 DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl); | 249 DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl); |
250 }; | 250 }; |
251 | 251 |
252 } // namespace gpu | 252 } // namespace gpu |
253 | 253 |
254 #endif // GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ | 254 #endif // GPU_IPC_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ |
OLD | NEW |