1 files changed, 9 insertions, 9 deletions

diff --git a/chromium/content/common/gpu/client/context_provider_command_buffer.h b/chromium/content/common/gpu/client/context_provider_command_buffer.h
index 2f8e4f2ee0f..aa8613a7007 100644
--- a/chromium/content/common/gpu/client/context_provider_command_buffer.h
+++ b/chromium/content/common/gpu/client/context_provider_command_buffer.h
@@ -12,6 +12,7 @@
 #include "cc/output/context_provider.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
+#include "webkit/common/gpu/context_provider_web_context.h"
 
 namespace webkit {
 namespace gpu {
@@ -24,21 +25,26 @@ namespace content {
 // Implementation of cc::ContextProvider that provides a
 // WebGraphicsContext3DCommandBufferImpl context and a GrContext.
 class CONTENT_EXPORT ContextProviderCommandBuffer
-    : NON_EXPORTED_BASE(public cc::ContextProvider) {
+    : NON_EXPORTED_BASE(public webkit::gpu::ContextProviderWebContext) {
  public:
   static scoped_refptr<ContextProviderCommandBuffer> Create(
       scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
       const std::string& debug_name);
 
+  CommandBufferProxyImpl* GetCommandBufferProxy();
+
+  // ContextProviderWebContext implementation.
+  virtual WebGraphicsContext3DCommandBufferImpl* WebContext3D() OVERRIDE;
+
+  // cc::ContextProvider implementation.
   virtual bool BindToCurrentThread() OVERRIDE;
-  virtual WebGraphicsContext3DCommandBufferImpl* Context3d() OVERRIDE;
   virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE;
   virtual gpu::ContextSupport* ContextSupport() OVERRIDE;
   virtual class GrContext* GrContext() OVERRIDE;
-  virtual void MakeGrContextCurrent() OVERRIDE;
   virtual Capabilities ContextCapabilities() OVERRIDE;
   virtual bool IsContextLost() OVERRIDE;
   virtual void VerifyContexts() OVERRIDE;
+  virtual void DeleteCachedResources() OVERRIDE;
   virtual bool DestroyedOnMainThread() OVERRIDE;
   virtual void SetLostContextCallback(
       const LostContextCallback& lost_context_callback) OVERRIDE;
@@ -46,11 +52,6 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
       const MemoryPolicyChangedCallback& memory_policy_changed_callback)
       OVERRIDE;
 
-  void set_leak_on_destroy() {
-    base::AutoLock lock(main_thread_lock_);
-    leak_on_destroy_ = true;
-  }
-
  protected:
   ContextProviderCommandBuffer(
       scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
@@ -76,7 +77,6 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
   MemoryPolicyChangedCallback memory_policy_changed_callback_;
 
   base::Lock main_thread_lock_;
-  bool leak_on_destroy_;
   bool destroyed_;
 
   class LostContextCallbackProxy;