| 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 e0132fdcd5fe8ba9d1613f01b2328c215908b474..c947dc5cadf2f8dd734bc8205054248b7d9b5cb8 100644
|
| --- a/content/common/gpu/client/command_buffer_proxy_impl.h
|
| +++ b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| @@ -15,6 +15,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "gpu/command_buffer/common/capabilities.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"
|
| @@ -96,7 +97,6 @@ class CommandBufferProxyImpl
|
| gpu::error::ContextLostReason reason) OVERRIDE;
|
|
|
| // gpu::GpuControl implementation:
|
| - virtual gpu::Capabilities GetCapabilities() OVERRIDE;
|
| virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(
|
| size_t width,
|
| size_t height,
|
| @@ -140,6 +140,8 @@ class CommandBufferProxyImpl
|
|
|
| GpuChannelHost* channel() const { return channel_; }
|
|
|
| + const gpu::Capabilities& capabilities() const { return capabilities_; }
|
| +
|
| private:
|
| typedef std::map<int32, gpu::Buffer> TransferBufferMap;
|
| typedef base::hash_map<uint32, base::Closure> SignalTaskMap;
|
|
|