Split WebGraphicsContext3DCommandBufferImpl::initialize() into two stages.

content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h

 // Copyright (c) 2011 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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "content/renderer/gpu/renderer_gl_context.h"
+#include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if !defined(OS_MACOSX)
 #define FLIP_FRAMEBUFFER_VERTICALLY
 #endif
 
 class GpuChannelHost;
@@ skipping 399 matching lines @@
 
   virtual void setContextLostCallback(
       WebGraphicsContext3D::WebGraphicsContextLostCallback* callback);
   virtual WGC3Denum getGraphicsResetStatusARB();
 
   virtual void setSwapBuffersCompleteCallbackCHROMIUM(
       WebGraphicsContext3D::
           WebGraphicsSwapBuffersCompleteCallbackCHROMIUM* callback);
 
  private:
+  // Second stage init. Called from compositor thread via makeContextCurrent().

[jamesr, 2011/08/23 01:23:23]

I'm not in love with this comment.  It assumes a background knowledge from the
reader that is not obvious and it is incorrect for most contexts since only some
contexts are compositor context.

Can you explain instead what this function does, when it should be called, and
what the threading implications are?

[lain Merrick, 2011/08/23 01:31:03]

Sure, will do. I wanted *some* comment but kept it terse to match surrounding
code. Happy to make it more detailed.

+  bool InitializeGLES2();

[nduca, 2011/08/23 05:08:19]

Any other names for this bikeshed? ;)

InitializeChannel?

[lain Merrick, 2011/08/24 19:52:05]

I just went for InitializeGL. And on second thoughts it's nicer to allow
idempotent calls, so... MaybeInitializeGL.

+
   // SwapBuffers callback.
   void OnSwapBuffersComplete();
   virtual void OnContextLost(RendererGLContext::ContextLostReason reason);
 
   // The context we use for OpenGL rendering.
   RendererGLContext* context_;
   // The GLES2Implementation we use for OpenGL rendering.
   gpu::gles2::GLES2Implementation* gl_;
 
+  // State needed by InitializeGLES2.
+  GpuChannelHost* host_;
+  GURL active_url_;
+  int32 render_view_routing_id_;
+
   bool render_directly_to_web_view_;
 #ifndef WTF_USE_THREADED_COMPOSITING
   // If rendering directly to WebView, weak pointer to it.
   WebKit::WebView* web_view_;
 #endif
 #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_;
@@ skipping 14 matching lines @@
 #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_