diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 00:11:11 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 00:11:11 +0000 |
| commit | e7e7ebdcb1147a739a10929ed8f73be6044946ba (patch) | |
| tree | b96b0fe1963b97ea7fb27fd91225375390e9db85 /webkit | |
| parent | 7ad4583b7894d77582bc4fda17f7d80dbd6eb84c (diff) | |
| download | chromium_src-e7e7ebdcb1147a739a10929ed8f73be6044946ba.zip chromium_src-e7e7ebdcb1147a739a10929ed8f73be6044946ba.tar.gz chromium_src-e7e7ebdcb1147a739a10929ed8f73be6044946ba.tar.bz2 | |
Remove WebGraphicsContext3D getter from cc::ContextProvider
The compositor uses GLES2Interface to talk to the OpenGL context now, so
the WebGraphicsContext3D getter isn't applicable at this layer.
BUG=181120
Review URL: https://codereview.chromium.org/132163004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/gpu/context_provider_in_process.cc | 7 | ||||
| -rw-r--r-- | webkit/common/gpu/context_provider_in_process.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/webkit/common/gpu/context_provider_in_process.cc b/webkit/common/gpu/context_provider_in_process.cc index 70d9d34..1e543a5 100644 --- a/webkit/common/gpu/context_provider_in_process.cc +++ b/webkit/common/gpu/context_provider_in_process.cc @@ -117,13 +117,6 @@ ContextProviderInProcess::ContextCapabilities() { return capabilities_; } -blink::WebGraphicsContext3D* ContextProviderInProcess::Context3d() { - DCHECK(lost_context_callback_proxy_); // Is bound to thread. - DCHECK(context_thread_checker_.CalledOnValidThread()); - - return context3d_.get(); -} - ::gpu::gles2::GLES2Interface* ContextProviderInProcess::ContextGL() { DCHECK(context3d_); DCHECK(lost_context_callback_proxy_); // Is bound to thread. diff --git a/webkit/common/gpu/context_provider_in_process.h b/webkit/common/gpu/context_provider_in_process.h index 2abc7f3..59d5866 100644 --- a/webkit/common/gpu/context_provider_in_process.h +++ b/webkit/common/gpu/context_provider_in_process.h @@ -31,9 +31,9 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess static scoped_refptr<ContextProviderInProcess> CreateOffscreen(); virtual blink::WebGraphicsContext3D* WebContext3D() OVERRIDE; + virtual bool BindToCurrentThread() OVERRIDE; virtual Capabilities ContextCapabilities() OVERRIDE; - virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE; virtual ::gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; virtual ::gpu::ContextSupport* ContextSupport() OVERRIDE; virtual class GrContext* GrContext() OVERRIDE; |