Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / gpu / command_buffer / service / command_buffer_service.cc

diff --git a/src/gpu/command_buffer/service/command_buffer_service.cc b/src/gpu/command_buffer/service/command_buffer_service.cc
index df2bd07..c9c0782 100644 (file)
--- a/src/gpu/command_buffer/service/command_buffer_service.cc
+++ b/src/gpu/command_buffer/service/command_buffer_service.cc
@@ -37,7 +37,7 @@ bool CommandBufferService::Initialize() {
   return true;
 }
 
-CommandBufferService::State CommandBufferService::GetState() {
+CommandBufferService::State CommandBufferService::GetLastState() {
   State state;
   state.num_entries = num_entries_;
   state.get_offset = get_offset_;
@@ -50,17 +50,13 @@ CommandBufferService::State CommandBufferService::GetState() {
   return state;
 }
 
-CommandBufferService::State CommandBufferService::GetLastState() {
-  return GetState();
-}
-
 int32 CommandBufferService::GetLastToken() {
-  return GetState().token;
+  return GetLastState().token;
 }
 
 void CommandBufferService::UpdateState() {
   if (shared_state_) {
-    CommandBufferService::State state = GetState();
+    CommandBufferService::State state = GetLastState();
     shared_state_->Write(state);
   }
 }
@@ -103,17 +99,15 @@ void CommandBufferService::SetGetBuffer(int32 transfer_buffer_id) {
   UpdateState();
 }
 
-bool CommandBufferService::SetSharedStateBuffer(
-    scoped_ptr<base::SharedMemory> shared_state_shm) {
-  shared_state_shm_.reset(shared_state_shm.release());
-  if (!shared_state_shm_->Map(sizeof(*shared_state_)))
-    return false;
+void CommandBufferService::SetSharedStateBuffer(
+    scoped_ptr<BufferBacking> shared_state_buffer) {
+  shared_state_buffer_ = shared_state_buffer.Pass();
+  DCHECK(shared_state_buffer_->GetSize() >= sizeof(*shared_state_));
 
   shared_state_ =
-      static_cast<CommandBufferSharedState*>(shared_state_shm_->memory());
+      static_cast<CommandBufferSharedState*>(shared_state_buffer_->GetMemory());
 
   UpdateState();
-  return true;
 }
 
 void CommandBufferService::SetGetOffset(int32 get_offset) {
@@ -132,7 +126,8 @@ scoped_refptr<Buffer> CommandBufferService::CreateTransferBuffer(size_t size,
   static int32 next_id = 1;
   *id = next_id++;
 
-  if (!RegisterTransferBuffer(*id, shared_memory.Pass(), size)) {
+  if (!RegisterTransferBuffer(
+          *id, MakeBackingFromSharedMemory(shared_memory.Pass(), size))) {
     *id = -1;
     return NULL;
   }
@@ -157,10 +152,8 @@ scoped_refptr<Buffer> CommandBufferService::GetTransferBuffer(int32 id) {
 
 bool CommandBufferService::RegisterTransferBuffer(
     int32 id,
-    scoped_ptr<base::SharedMemory> shared_memory,
-    size_t size) {
-  return transfer_buffer_manager_->RegisterTransferBuffer(
-      id, shared_memory.Pass(), size);
+    scoped_ptr<BufferBacking> buffer) {
+  return transfer_buffer_manager_->RegisterTransferBuffer(id, buffer.Pass());
 }
 
 void CommandBufferService::SetToken(int32 token) {