Index: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h |
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h |
index 9ef3698fe096a60be01ca32bc708970855bd5523..d3620b411b2e5e0f80574e46892f3e87bac5d82a 100644 |
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h |
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h |
@@ -39,6 +39,7 @@ using WebKit::WGC3Dsizeiptr; |
namespace gpu { |
class GLInProcessContext; |
+struct GLInProcessContextAttribs; |
} |
namespace webkit { |
@@ -54,8 +55,18 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl |
static scoped_ptr<WebKit::WebGraphicsContext3D> CreateOffscreenContext( |
const WebKit::WebGraphicsContext3D::Attributes& attributes); |
+ static scoped_ptr<WebKit::WebGraphicsContext3D> WrapContext( |
+ scoped_ptr< ::gpu::GLInProcessContext> context, |
+ const WebKit::WebGraphicsContext3D::Attributes& attributes); |
+ |
virtual ~WebGraphicsContext3DInProcessCommandBufferImpl(); |
+ // Convert WebGL context creation attributes into GLInProcessContext / EGL |
+ // size requests. |
+ static void ConvertAttributes( |
+ const WebKit::WebGraphicsContext3D::Attributes& attributes, |
+ ::gpu::GLInProcessContextAttribs* output_attribs); |
+ |
//---------------------------------------------------------------------- |
// WebGraphicsContext3D methods |
virtual bool makeContextCurrent(); |
@@ -536,6 +547,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl |
private: |
WebGraphicsContext3DInProcessCommandBufferImpl( |
+ scoped_ptr< ::gpu::GLInProcessContext> context, |
const WebKit::WebGraphicsContext3D::Attributes& attributes, |
bool is_offscreen, |
gfx::AcceleratedWidget window); |