Cleanup GpuMemoryBuffer

content/common/gpu/client/command_buffer_proxy_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 132 matching lines @@
   // ints redundantly when only the error is needed for the
   // CommandBufferProxyImpl implementation.
   gpu::error::Error GetLastError() override;
 
   GpuChannelHost* channel() const { return channel_; }
 
   base::SharedMemoryHandle GetSharedStateHandle() const {
     return shared_state_shm_->handle();
   }
 
+  void WaitForPendingGpuMemoryBufferUsageToComplete(
+      const base::Closure& callback);
+
  private:
   typedef std::map<int32, scoped_refptr<gpu::Buffer> > TransferBufferMap;
   typedef base::hash_map<uint32, base::Closure> SignalTaskMap;
   typedef base::ScopedPtrHashMap<int32, gfx::GpuMemoryBuffer>
       GpuMemoryBufferMap;
 
   // Send an IPC message over the GPU channel. This is private to fully
   // encapsulate the channel; all callers of this function must explicitly
   // verify that the context has not been lost.
   bool Send(IPC::Message* msg);
 
   // Message handlers:
   void OnUpdateState(const gpu::CommandBuffer::State& state);
   void OnDestroyed(gpu::error::ContextLostReason reason);
   void OnConsoleMessage(const GPUCommandBufferConsoleMessage& message);
   void OnSetMemoryAllocation(const gpu::MemoryAllocation& allocation);
   void OnSignalSyncPointAck(uint32 id);
   void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info);
 
   // Try to read an updated copy of the state from shared memory.
   void TryUpdateState();
 
   // The shared memory area used to update state.
   gpu::CommandBufferSharedState* shared_state() const;
 
+  void GpuMemoryBufferSyncPointSignalled(uint32 sync_point);

[reveman, 2014/10/22 22:42:47]

GpuMemoryBufferUsageCompleted?

+  uint32 GetNextSignalId();
+
   // Unowned list of DeletionObservers.
   ObserverList<DeletionObserver> deletion_observers_;
 
   // The last cached state received from the service.
   State last_state_;
 
   // The shared memory area used to update state.
   scoped_ptr<base::SharedMemory> shared_state_shm_;
 
   // |*this| is owned by |*channel_| and so is always outlived by it, so using a
   // raw pointer is ok.
   GpuChannelHost* channel_;
   int route_id_;
   unsigned int flush_count_;
   int32 last_put_offset_;
 
   base::Closure channel_error_callback_;
 
   MemoryAllocationChangedCallback memory_allocation_changed_callback_;
 
   GpuConsoleMessageCallback console_message_callback_;
 
   // Tasks to be invoked in SignalSyncPoint responses.
   uint32 next_signal_id_;
   SignalTaskMap signal_tasks_;
+  // Protects signal_tasks_.
+  mutable base::Lock signal_lock_;
 
   // Local cache of id to gpu memory buffer mapping.
   GpuMemoryBufferMap gpu_memory_buffers_;
 
   gpu::Capabilities capabilities_;
 
   std::vector<ui::LatencyInfo> latency_info_;
 
   SwapBuffersCompletionCallback swap_buffers_completion_callback_;
 
+  SignalTaskMap gpu_memory_buffer_tasks_;

[reveman, 2014/10/22 22:42:47]

I think we should use a different id namespace and map for these tasks.

GpuMemoryBufferUsageCompletedMap gpu_memory_buffer_usage_completed_tasks_;

+  mutable base::Lock gpu_memory_buffer_task_lock_;
+
   DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_