| 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 260779ea0a9f5bf517dec106d5583283367435b6..22cd3b373aa46faedaef39876edc23a071f48685 100644
|
| --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| @@ -46,12 +46,10 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| : public NON_EXPORTED_BASE(WebKit::WebGraphicsContext3D) {
|
| public:
|
|
|
| - WebGraphicsContext3DInProcessCommandBufferImpl();
|
| + explicit WebGraphicsContext3DInProcessCommandBufferImpl(
|
| + const WebKit::WebGraphicsContext3D::Attributes& attributes);
|
| virtual ~WebGraphicsContext3DInProcessCommandBufferImpl();
|
|
|
| - bool Initialize(WebKit::WebGraphicsContext3D::Attributes attributes,
|
| - WebKit::WebGraphicsContext3D* view_context);
|
| -
|
| //----------------------------------------------------------------------
|
| // WebGraphicsContext3D methods
|
| virtual bool makeContextCurrent();
|
| @@ -532,10 +530,15 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| void OnSwapBuffersComplete();
|
| virtual void OnContextLost();
|
|
|
| + bool MaybeInitializeGL();
|
| +
|
| // Used to try to find bugs in code that calls gl directly through the gl api
|
| // instead of going through WebGraphicsContext3D.
|
| void ClearContext();
|
|
|
| + bool initialized_;
|
| + bool initialize_failed_;
|
| +
|
| // The context we use for OpenGL rendering.
|
| GLInProcessContext* context_;
|
| // The GLES2Implementation we use for OpenGL rendering.
|
|
|