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 b1f8fa15fea6a2d3da4a9681f8dad587a01d6c35..7a04d6f165ebdf42dded5f103abb244900bb77e7 100644 |
--- a/gpu/command_buffer/service/command_buffer_service.h |
+++ b/gpu/command_buffer/service/command_buffer_service.h |
@@ -7,6 +7,7 @@ |
#include "base/callback.h" |
#include "base/memory/shared_memory.h" |
+#include "base/synchronization/lock.h" |
piman
2014/02/07 22:58:20
You don't need this, or the other changes in this
jadahl
2014/02/08 09:18:25
Oops. Left them here unintentionally.
|
#include "gpu/command_buffer/common/command_buffer.h" |
#include "gpu/command_buffer/common/command_buffer_shared.h" |
@@ -67,6 +68,8 @@ class GPU_EXPORT CommandBufferService : public CommandBuffer { |
size_t size); |
private: |
+ State GetStateImpl(); |
+ |
int32 ring_buffer_id_; |
Buffer ring_buffer_; |
scoped_ptr<base::SharedMemory> shared_state_shm_; |
@@ -79,9 +82,11 @@ class GPU_EXPORT CommandBufferService : public CommandBuffer { |
base::Closure parse_error_callback_; |
TransferBufferManagerInterface* transfer_buffer_manager_; |
int32 token_; |
+ uint32 async_token_; |
uint32 generation_; |
error::Error error_; |
error::ContextLostReason context_lost_reason_; |
+ base::Lock lock_; |
DISALLOW_COPY_AND_ASSIGN(CommandBufferService); |
}; |