Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D

webkit/gpu/webgraphicscontext3d_in_process_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 WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
 #define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
 
 #include <list>
 #include <set>
 
@@ skipping 39 matching lines @@
 // requires the sandbox to be disabled, which is strongly discouraged.
 // It is provided for support of test_shell and any Chromium ports
 // where an in-renderer WebGL implementation would be helpful.
 
 class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
  public:
   // Creates a WebGraphicsContext3DInProcessImpl for a given window. If window
   // is gfx::kNullPluginWindow, then it creates an offscreen context.
   // share_group is the group this context shares namespaces with. It's only
   // used for window-bound countexts.
-  WebGraphicsContext3DInProcessImpl(gfx::AcceleratedWidget window,
-                                    gfx::GLShareGroup* share_group);
+  WebGraphicsContext3DInProcessImpl(gfx::GLSurface* surface,
+                                    gfx::GLContext* context,
+                                    bool render_directly_to_webview);
   virtual ~WebGraphicsContext3DInProcessImpl();
+  static WebGraphicsContext3DInProcessImpl* CreateForWebView(
+      WebGraphicsContext3D::Attributes attributes,
+      WebView* web_view,
+      bool render_directly_to_webview);
+  static WebGraphicsContext3DInProcessImpl* CreateForWindow(
+      WebGraphicsContext3D::Attributes attributes,
+      gfx::AcceleratedWidget window,
+      gfx::GLShareGroup* share_group);
 
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
-  virtual bool initialize(
-      WebGraphicsContext3D::Attributes attributes, WebView*, bool);
   virtual bool makeContextCurrent();
 
   virtual int width();
   virtual int height();
 
   virtual bool isGLES2Compliant();
 
   virtual bool setParentContext(WebGraphicsContext3D* parent_context);
 
   virtual void reshape(int width, int height);
@@ skipping 371 matching lines @@
   virtual void texStorage2DEXT(
       WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
       WGC3Dint width, WGC3Dint height);
 
  protected:
 #if WEBKIT_USING_SKIA
   virtual GrGLInterface* onCreateGrGLInterface();
 #endif
 
  private:
+  bool Initialize(Attributes attributes);
+
   // ANGLE related.
   struct ShaderSourceEntry;
 
   typedef base::hash_map<WebGLId, ShaderSourceEntry*> ShaderSourceMap;
 
   bool AllocateOffscreenFrameBuffer(int width, int height);
   void ClearRenderTarget();
 
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
   void FlipVertically(unsigned char* framebuffer,
@@ skipping 46 matching lines @@
   std::list<WGC3Denum> synthetic_errors_list_;
   std::set<WGC3Denum> synthetic_errors_set_;
 
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
 
   ShaderSourceMap shader_source_map_;
 
   ShHandle fragment_compiler_;
   ShHandle vertex_compiler_;
-  gfx::AcceleratedWidget window_;
-  scoped_refptr<gfx::GLShareGroup> share_group_;
 };
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_