| 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 ee10bf1fb509776cfbc77db005eb154c89f6e601..1b4249a0b6a72298b3290f08bea432afa20dc78c 100644
|
| --- a/content/common/gpu/client/context_provider_command_buffer.h
|
| +++ b/content/common/gpu/client/context_provider_command_buffer.h
|
| @@ -15,14 +15,10 @@
|
| #include "content/common/gpu/client/command_buffer_metrics.h"
|
| #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
|
|
|
| -namespace webkit {
|
| -namespace gpu {
|
| -class GrContextForWebGraphicsContext3D;
|
| -}
|
| -}
|
| -
|
| namespace content {
|
|
|
| +class GrContextForWebGraphicsContext3D;
|
| +
|
| // Implementation of cc::ContextProvider that provides a
|
| // WebGraphicsContext3DCommandBufferImpl context and a GrContext.
|
| class CONTENT_EXPORT ContextProviderCommandBuffer
|
| @@ -72,7 +68,7 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
|
| base::ThreadChecker context_thread_checker_;
|
|
|
| scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d_;
|
| - scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_;
|
| + scoped_ptr<GrContextForWebGraphicsContext3D> gr_context_;
|
|
|
| cc::ContextProvider::Capabilities capabilities_;
|
| CommandBufferContextType context_type_;
|
|
|