Index: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h |
=================================================================== |
--- content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h (revision 97867) |
+++ content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h (working copy) |
@@ -12,6 +12,7 @@ |
#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" |
@@ -431,6 +432,9 @@ |
WebGraphicsSwapBuffersCompleteCallbackCHROMIUM* callback); |
private: |
+ // Second stage init. Called from compositor thread via makeContextCurrent(). |
+ bool InitializeGLES2(); |
+ |
// SwapBuffers callback. |
void OnSwapBuffersComplete(); |
virtual void OnContextLost(RendererGLContext::ContextLostReason reason); |
@@ -440,6 +444,11 @@ |
// 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. |