| Index: content/common/gpu/client/context_provider_command_buffer.h
|
| diff --git a/content/common/gpu/client/context_provider_command_buffer.h b/content/common/gpu/client/context_provider_command_buffer.h
|
| index 00efb1f7818be2749dfb7e229ec1db8f11680cb5..48a52167f340c35680ec07dbf89a386d83f21bd9 100644
|
| --- a/content/common/gpu/client/context_provider_command_buffer.h
|
| +++ b/content/common/gpu/client/context_provider_command_buffer.h
|
| @@ -17,6 +17,7 @@
|
| #include "content/common/content_export.h"
|
| #include "content/common/gpu/client/command_buffer_metrics.h"
|
| #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
|
| +#include "gpu/command_buffer/client/shared_memory_limits.h"
|
|
|
| namespace skia_bindings {
|
| class GrContextForGLES2Interface;
|
| @@ -31,6 +32,7 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
|
| public:
|
| ContextProviderCommandBuffer(
|
| std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
|
| + const gpu::SharedMemoryLimits& memory_limits,
|
| CommandBufferContextType type);
|
|
|
| gpu::CommandBufferProxyImpl* GetCommandBufferProxy();
|
| @@ -47,7 +49,7 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
|
| void InvalidateGrContext(uint32_t state) override;
|
| void SetupLock() override;
|
| base::Lock* GetLock() override;
|
| - Capabilities ContextCapabilities() override;
|
| + gpu::Capabilities ContextCapabilities() override;
|
| void DeleteCachedResources() override;
|
| void SetLostContextCallback(
|
| const LostContextCallback& lost_context_callback) override;
|
| @@ -58,15 +60,13 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
|
| void OnLostContext();
|
|
|
| private:
|
| - void InitializeCapabilities();
|
| -
|
| base::ThreadChecker main_thread_checker_;
|
| base::ThreadChecker context_thread_checker_;
|
|
|
| std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> context3d_;
|
| std::unique_ptr<skia_bindings::GrContextForGLES2Interface> gr_context_;
|
|
|
| - cc::ContextProvider::Capabilities capabilities_;
|
| + gpu::SharedMemoryLimits memory_limits_;
|
| CommandBufferContextType context_type_;
|
| std::string debug_name_;
|
|
|
|
|