| 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 985cc8b9b7c7c3aab96a03eb468e3a3f7fe44a1f..ce564653415721d1b44f0a4cb6c005e1e4b674f5 100644
|
| --- a/content/common/gpu/client/command_buffer_proxy_impl.h
|
| +++ b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/containers/hash_tables.h"
|
| +#include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| @@ -28,10 +29,6 @@ namespace base {
|
| class SharedMemory;
|
| }
|
|
|
| -namespace gfx {
|
| -class GpuMemoryBuffer;
|
| -}
|
| -
|
| namespace gpu {
|
| struct Mailbox;
|
| }
|
| @@ -147,7 +144,8 @@ class CommandBufferProxyImpl
|
| private:
|
| typedef std::map<int32, scoped_refptr<gpu::Buffer> > TransferBufferMap;
|
| typedef base::hash_map<uint32, base::Closure> SignalTaskMap;
|
| - typedef std::map<int32, gfx::GpuMemoryBuffer*> GpuMemoryBufferMap;
|
| + 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
|
|
|