| Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| index 1bb95af10b95f4d7fa4c72f3fcf27ab909189c4f..86c45b2ce2b84aacb86d238f74ab8b19fbb01803 100644
|
| --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| @@ -53,8 +53,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| WebGraphicsContext3DInProcessCommandBufferImpl();
|
| virtual ~WebGraphicsContext3DInProcessCommandBufferImpl();
|
|
|
| - bool Initialize(WebKit::WebGraphicsContext3D::Attributes attributes,
|
| - WebKit::WebGraphicsContext3D* view_context);
|
| + bool Initialize(const WebKit::WebGraphicsContext3D::Attributes& attributes);
|
|
|
| //----------------------------------------------------------------------
|
| // WebGraphicsContext3D methods
|
| @@ -513,10 +512,14 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| void OnSwapBuffersComplete();
|
| virtual void OnContextLost();
|
|
|
| + bool DoInitialize();
|
| +
|
| // Used to try to find bugs in code that calls gl directly through the gl api
|
| // instead of going through WebGraphicsContext3D.
|
| void ClearContext();
|
|
|
| + bool pending_lazy_initialize_;
|
| +
|
| // The context we use for OpenGL rendering.
|
| GLInProcessContext* context_;
|
| // The GLES2Implementation we use for OpenGL rendering.
|
|
|