| Index: content/common/gpu/client/command_buffer_proxy_impl.h
|
| diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| index c8914833a17c433fcf770efcc2bd6d179c08a0f1..35255a9ca8cc2529b28c33f6ab127d8a28fda3c6 100644
|
| --- a/content/common/gpu/client/command_buffer_proxy_impl.h
|
| +++ b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| @@ -16,7 +16,6 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "content/common/gpu/gpu_memory_allocation.h"
|
| -#include "content/common/gpu/gpu_memory_allocation.h"
|
| #include "gpu/command_buffer/common/command_buffer.h"
|
| #include "gpu/command_buffer/common/command_buffer_shared.h"
|
| #include "gpu/command_buffer/common/gpu_control.h"
|
| @@ -30,6 +29,10 @@ namespace base {
|
| class SharedMemory;
|
| }
|
|
|
| +namespace gfx {
|
| +class GpuMemoryBuffer;
|
| +}
|
| +
|
| namespace gpu {
|
| struct Mailbox;
|
| }
|
| @@ -145,6 +148,7 @@ class CommandBufferProxyImpl
|
| private:
|
| typedef std::map<int32, gpu::Buffer> TransferBufferMap;
|
| typedef base::hash_map<uint32, base::Closure> SignalTaskMap;
|
| + typedef std::map<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
|
| @@ -202,6 +206,9 @@ class CommandBufferProxyImpl
|
| uint32 next_signal_id_;
|
| SignalTaskMap signal_tasks_;
|
|
|
| + // Local cache of id to gpu memory buffer mapping.
|
| + GpuMemoryBufferMap gpu_memory_buffers_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl);
|
| };
|
|
|
|
|