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..95128db597ce6da6996c7ca04bf8fa693fa6741d 100644 |
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h |
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h |
@@ -50,12 +50,10 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl |
: public NON_EXPORTED_BASE(WebKit::WebGraphicsContext3D) { |
public: |
- WebGraphicsContext3DInProcessCommandBufferImpl(); |
+ WebGraphicsContext3DInProcessCommandBufferImpl( |
+ const WebKit::WebGraphicsContext3D::Attributes& attributes); |
virtual ~WebGraphicsContext3DInProcessCommandBufferImpl(); |
- bool Initialize(WebKit::WebGraphicsContext3D::Attributes attributes, |
- WebKit::WebGraphicsContext3D* view_context); |
- |
//---------------------------------------------------------------------- |
// WebGraphicsContext3D methods |
virtual bool makeContextCurrent(); |
@@ -513,10 +511,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. |