diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 16:40:46 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 16:40:46 +0000 |
| commit | 1620073d2d6ab0e8954fe3d6f2bfb84e98a9554f (patch) | |
| tree | 859728ab09463eed345fea9519bf8913507fae34 /webkit/gpu/webgraphicscontext3d_in_process_impl.cc | |
| parent | 96e1933fd50fb512c5e678169d0d2c59841a7d1a (diff) | |
| download | chromium_src-1620073d2d6ab0e8954fe3d6f2bfb84e98a9554f.zip chromium_src-1620073d2d6ab0e8954fe3d6f2bfb84e98a9554f.tar.gz chromium_src-1620073d2d6ab0e8954fe3d6f2bfb84e98a9554f.tar.bz2 | |
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
Diffstat (limited to 'webkit/gpu/webgraphicscontext3d_in_process_impl.cc')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
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; |