From 1620073d2d6ab0e8954fe3d6f2bfb84e98a9554f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 29 Aug 2011 16:40:46 +0000 Subject: Allow each WGC3D subclass to determine the correct GrGLInterface for its GrContext. Review URL: http://codereview.chromium.org/7753035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98645 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'webkit/gpu/webgraphicscontext3d_in_process_impl.cc') diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index d27aa9a..f149813 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -107,7 +107,6 @@ bool WebGraphicsContext3DInProcessImpl::initialize( bool render_directly_to_web_view) { if (!gfx::GLSurface::InitializeOneOff()) return false; - gfx::BindSkiaToInProcessGL(); render_directly_to_web_view_ = render_directly_to_web_view; gfx::GLShareGroup* share_group = 0; @@ -1552,6 +1551,12 @@ WGC3Denum WebGraphicsContext3DInProcessImpl::getGraphicsResetStatusARB() { return GL_NO_ERROR; } +#if WEBKIT_USING_SKIA +GrGLInterface* WebGraphicsContext3DInProcessImpl::grGLInterface() { + return gfx::GetInProcessSkiaGLBinding(); +} +#endif + bool WebGraphicsContext3DInProcessImpl::AngleCreateCompilers() { if (!ShInitialize()) return false; -- cgit v1.1