Reland 98392 - 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 "base/task.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 25 matching lines @@
 
   WebGraphicsContext3DCommandBufferImpl();
   virtual ~WebGraphicsContext3DCommandBufferImpl();
 
   //----------------------------------------------------------------------
   // 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.
+  // TODO(husky): Document threading restrictions in WebGraphicsContext3D.h,
+  // enforce strictly in all implementations.
   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 358 matching lines @@
 
   virtual void setSwapBuffersCompleteCallbackCHROMIUM(
       WebGraphicsContext3D::
           WebGraphicsSwapBuffersCompleteCallbackCHROMIUM* callback);
 
 #if WEBKIT_USING_SKIA
   virtual GrGLInterface* grGLInterface();
 #endif
 
  private:
+  // Initialize the underlying GL context. May be called multiple times; second
+  // and subsequent calls are ignored. Must be called from the thread that is
+  // going to use this object to issue GL commands (which might not be the main
+  // thread).
+  bool 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 MaybeInitializeGL.
+  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 17 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_