Remove renderer dependencies from the GPU client classes.

content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_GPU_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #define CONTENT_RENDERER_GPU_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #pragma once
 
-#if defined(ENABLE_GPU)
-
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/renderer/gpu/renderer_gl_context.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 19 matching lines @@
 using WebKit::WGC3Dboolean;
 using WebKit::WGC3Dbitfield;
 using WebKit::WGC3Dint;
 using WebKit::WGC3Dsizei;
 using WebKit::WGC3Duint;
 using WebKit::WGC3Dfloat;
 using WebKit::WGC3Dclampf;
 using WebKit::WGC3Dintptr;
 using WebKit::WGC3Dsizeiptr;
 
+// TODO(piman): move this logic to the compositor and remove it from the
+// context...
+class WebGraphicsContext3DSwapBuffersClient {
+ public:
+  virtual ~WebGraphicsContext3DSwapBuffersClient() { }
+  virtual void OnViewContextSwapBuffersPosted() = 0;
+  virtual void OnViewContextSwapBuffersComplete() = 0;
+  virtual void OnViewContextSwapBuffersAborted() = 0;
+};
+
 class WebGraphicsContext3DCommandBufferImpl
     : public WebKit::WebGraphicsContext3D {
  public:
-  WebGraphicsContext3DCommandBufferImpl();
+  WebGraphicsContext3DCommandBufferImpl(
+      int surface_id,
+      const GURL& active_url,
+      const base::WeakPtr<WebGraphicsContext3DSwapBuffersClient>& swap_client);
   virtual ~WebGraphicsContext3DCommandBufferImpl();
 
+  bool Initialize(const Attributes& attributes);
+
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
-  virtual bool initialize(WebGraphicsContext3D::Attributes attributes,
-                          WebKit::WebView*,
-                          bool renderDirectlyToWebView);
 
   // Must be called after initialize() and before any of the following methods.
   // Permanently binds to the first calling thread. Returns false if the
   // graphics context fails to create. Do not call from more than one thread.
   virtual bool makeContextCurrent();
 
   virtual int width();
   virtual int height();
 
   virtual bool isGLES2Compliant();
@@ skipping 412 matching lines @@
 
   bool initialize_failed_;
 
   // The context we use for OpenGL rendering.
   RendererGLContext* context_;
   // The GLES2Implementation we use for OpenGL rendering.
   gpu::gles2::GLES2Implementation* gl_;
 
   // State needed by MaybeInitializeGL.
   GpuChannelHost* host_;
+  int32 surface_id_;
   GURL active_url_;
-  int32 surface_id_;
+  base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client_;
 
-  bool render_directly_to_web_view_;
-
-  // If rendering directly to WebView, weak pointer to it.
-  // This is only set when the context is bound to the main thread.
-  WebKit::WebView* web_view_;
-
-#if defined(OS_MACOSX)
-  // "Fake" plugin window handle in browser process for the compositor's output.
-  gfx::PluginWindowHandle plugin_handle_;
-#endif
   WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_;
   WGC3Denum context_lost_reason_;
 
   WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM*
       swapbuffers_complete_callback_;
 
   WebKit::WebGraphicsContext3D::Attributes attributes_;
   gfx::GpuPreference gpu_preference_;
   int cached_width_, cached_height_;
 
   // For tracking which FBO is bound.
   WebGLId bound_fbo_;
 
   // Errors raised by synthesizeGLError().
   std::vector<WGC3Denum> synthetic_errors_;
 
   base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_;
 
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
   scoped_array<uint8> scanline_;
   void FlipVertically(uint8* framebuffer,
                       unsigned int width,
                       unsigned int height);
 #endif
 };
 
-#endif  // defined(ENABLE_GPU)
 #endif  // CONTENT_RENDERER_GPU_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_