Remove dead WebGraphicsContext3D initialization code

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

 // 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.
 
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 84 matching lines @@
   // in other implementations of OpenGL. If parent is not NULL, it must be used
   // on the same thread as the parent. A child GLInProcessContext may not
   // outlive its parent.  attrib_list must be NULL or a NONE-terminated list of
   // attribute/value pairs.
   static GLInProcessContext* CreateOffscreenContext(
       GLInProcessContext* parent,
       const gfx::Size& size,
       GLInProcessContext* context_group,
       const char* allowed_extensions,
       const int32* attrib_list,
-      const GURL& active_url,
       gfx::GpuPreference gpu_preference);
 
   // For an offscreen frame buffer GLInProcessContext, return the texture ID
   // with respect to the parent GLInProcessContext. Returns zero if
   // GLInProcessContext does not have a parent.
   uint32 GetParentTextureId();
 
   // Create a new texture in the parent's GLInProcessContext.  Returns zero if
   // GLInProcessContext does not have a parent.
   uint32 CreateParentTexture(const gfx::Size& size);
@@ skipping 28 matching lines @@
 
   CommandBufferService* GetCommandBufferService();
 
  private:
   explicit GLInProcessContext(GLInProcessContext* parent);
 
   bool Initialize(const gfx::Size& size,
                   GLInProcessContext* context_group,
                   const char* allowed_extensions,
                   const int32* attrib_list,
-                  const GURL& active_url,
                   gfx::GpuPreference gpu_preference);
   void Destroy();
 
   void OnContextLost();
 
   base::WeakPtr<GLInProcessContext> parent_;
   base::Closure context_lost_callback_;
   uint32 parent_texture_id_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr< ::gpu::GpuScheduler> gpu_scheduler_;
@@ skipping 48 matching lines @@
 GLInProcessContext::~GLInProcessContext() {
   Destroy();
 }
 
 GLInProcessContext* GLInProcessContext::CreateOffscreenContext(
     GLInProcessContext* parent,
     const gfx::Size& size,
     GLInProcessContext* context_group,
     const char* allowed_extensions,
     const int32* attrib_list,
-    const GURL& active_url,
     gfx::GpuPreference gpu_preference) {
   scoped_ptr<GLInProcessContext> context(new GLInProcessContext(parent));
   if (!context->Initialize(
       size,
       context_group,
       allowed_extensions,
       attrib_list,
-      active_url,
       gpu_preference))
     return NULL;
 
   return context.release();
 }
 
 // In the normal command buffer implementation, all commands are passed over IPC
 // to the gpu process where they are fed to the GLES2Decoder from a single
 // thread. In layout tests, any thread could call this function. GLES2Decoder,
 // and in particular the GL implementations behind it, are not generally
@@ skipping 96 matching lines @@
     : parent_(parent ?
           parent->AsWeakPtr() : base::WeakPtr<GLInProcessContext>()),
       parent_texture_id_(0),
       last_error_(SUCCESS) {
 }
 
 bool GLInProcessContext::Initialize(const gfx::Size& size,
                                     GLInProcessContext* context_group,
                                     const char* allowed_extensions,
                                     const int32* attrib_list,
-                                    const GURL& active_url,
                                     gfx::GpuPreference gpu_preference) {
   // Use one share group for all contexts.
   CR_DEFINE_STATIC_LOCAL(scoped_refptr<gfx::GLShareGroup>, share_group,
                          (new gfx::GLShareGroup));
 
   DCHECK(size.width() >= 0 && size.height() >= 0);
 
   // Ensure the gles2 library is initialized first in a thread safe way.
   g_gles2_initializer.Get();
 
@@ skipping 146 matching lines @@
 
 void GLInProcessContext::OnContextLost() {
   if (!context_lost_callback_.is_null())
     context_lost_callback_.Run();
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     WebGraphicsContext3DInProcessCommandBufferImpl()
     : context_(NULL),
       gl_(NULL),
-      web_view_(NULL),
       context_lost_callback_(NULL),
       context_lost_reason_(GL_NO_ERROR),
       cached_width_(0),
       cached_height_(0),
       bound_fbo_(0) {
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     ~WebGraphicsContext3DInProcessCommandBufferImpl() {
   base::AutoLock a(g_all_shared_contexts_lock.Get());
   g_all_shared_contexts.Pointer()->erase(this);
 }
 
-bool WebGraphicsContext3DInProcessCommandBufferImpl::initialize(
+bool WebGraphicsContext3DInProcessCommandBufferImpl::Initialize(
     WebGraphicsContext3D::Attributes attributes,
-    WebKit::WebView* web_view,
-    bool render_directly_to_web_view) {
+    WebKit::WebGraphicsContext3D* view_context) {
   // Convert WebGL context creation attributes into GLInProcessContext / EGL
   // size requests.
   const int alpha_size = attributes.alpha ? 8 : 0;
   const int depth_size = attributes.depth ? 24 : 0;
   const int stencil_size = attributes.stencil ? 8 : 0;
   const int samples = attributes.antialias ? 4 : 0;
   const int sample_buffers = attributes.antialias ? 1 : 0;
   const int32 attribs[] = {
     GLInProcessContext::ALPHA_SIZE, alpha_size,
     GLInProcessContext::DEPTH_SIZE, depth_size,
     GLInProcessContext::STENCIL_SIZE, stencil_size,
     GLInProcessContext::SAMPLES, samples,
     GLInProcessContext::SAMPLE_BUFFERS, sample_buffers,
     GLInProcessContext::NONE,
   };
 
   const char* preferred_extensions = "*";
 
   // TODO(kbr): More work will be needed in this implementation to
   // properly support GPU switching. Like in the out-of-process
   // command buffer implementation, all previously created contexts
   // will need to be lost either when the first context requesting the
   // discrete GPU is created, or the last one is destroyed.
   gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
 
-  GURL active_url;
-  if (web_view && web_view->mainFrame())
-    active_url = GURL(web_view->mainFrame()->document().url());
-
   GLInProcessContext* parent_context = NULL;
-  if (!render_directly_to_web_view) {
-    WebKit::WebGraphicsContext3D* view_context =
-        web_view ? web_view->graphicsContext3D() : NULL;
-    if (view_context) {
-      WebGraphicsContext3DInProcessCommandBufferImpl* context_impl =
-          static_cast<WebGraphicsContext3DInProcessCommandBufferImpl*>(
-              view_context);
-      parent_context = context_impl->context_;
-    }
+  if (view_context) {
+    WebGraphicsContext3DInProcessCommandBufferImpl* context_impl =
+        static_cast<WebGraphicsContext3DInProcessCommandBufferImpl*>(
+            view_context);
+    parent_context = context_impl->context_;
   }
 
   WebGraphicsContext3DInProcessCommandBufferImpl* context_group = NULL;
   base::AutoLock lock(g_all_shared_contexts_lock.Get());
   if (attributes.shareResources)
     context_group = g_all_shared_contexts.Pointer()->empty() ?
         NULL : *g_all_shared_contexts.Pointer()->begin();
 
   context_ = GLInProcessContext::CreateOffscreenContext(
       parent_context,
       gfx::Size(1, 1),
       context_group ? context_group->context_ : NULL,
       preferred_extensions,
       attribs,
-      active_url,
       gpu_preference);
-  web_view_ = NULL;
 
   if (!context_)
     return false;
 
   gl_ = context_->GetImplementation();
 
   if (gl_ && attributes.noExtensions)
     gl_->EnableFeatureCHROMIUM("webgl_enable_glsl_webgl_validation");
 
   context_->SetContextLostCallback(
@@ skipping 984 matching lines @@
 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
   // TODO(kbr): improve the precision here.
   context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit