Chromium Code Reviews| 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..a8bbc10d666304c2e328f970ed97d91ce66b4fac 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(); |
| + WebGraphicsContext3DInProcessCommandBufferImpl( |
|
jamesr
2013/03/27 00:24:35
needs explicit since this is a one-argument constr
boliu
2013/03/27 00:35:20
Done.
|
| + 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. |