diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 51cf45d..d04a459 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -24,7 +24,7 @@ #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" #include "ui/gfx/size.h" -#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" using gpu::gles2::GLES2Implementation; using gpu::GLInProcessContext; @@ -74,9 +74,12 @@ scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext( const blink::WebGraphicsContext3D::Attributes& attributes, gfx::AcceleratedWidget window) { - DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone); - return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl( + scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context; + if (gfx::GLSurface::InitializeOneOff()) { + context.reset(new WebGraphicsContext3DInProcessCommandBufferImpl( scoped_ptr< ::gpu::GLInProcessContext>(), attributes, false, window)); + } + return context.Pass(); } // static @@ -84,21 +87,24 @@ scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext( const blink::WebGraphicsContext3D::Attributes& attributes) { return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl( - scoped_ptr< ::gpu::GLInProcessContext>(), - attributes, - true, - gfx::kNullAcceleratedWidget)); + scoped_ptr< ::gpu::GLInProcessContext>(), + attributes, + true, + gfx::kNullAcceleratedWidget)) + .Pass(); } scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext( scoped_ptr< ::gpu::GLInProcessContext> context, const blink::WebGraphicsContext3D::Attributes& attributes) { - return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl( - context.Pass(), - attributes, - true /* is_offscreen. Not used. */, - gfx::kNullAcceleratedWidget /* window. Not used. */)); + return make_scoped_ptr( + new WebGraphicsContext3DInProcessCommandBufferImpl( + context.Pass(), + attributes, + true /* is_offscreen. Not used. */, + gfx::kNullAcceleratedWidget /* window. Not used. */)) + .Pass(); } WebGraphicsContext3DInProcessCommandBufferImpl:: |