| Index: trunk/src/content/common/gpu/client/context_provider_command_buffer.cc
|
| ===================================================================
|
| --- trunk/src/content/common/gpu/client/context_provider_command_buffer.cc (revision 244469)
|
| +++ trunk/src/content/common/gpu/client/context_provider_command_buffer.cc (working copy)
|
| @@ -87,15 +87,6 @@
|
| return context3d_->GetGPUProcessID();
|
| }
|
|
|
| -WebGraphicsContext3DCommandBufferImpl*
|
| -ContextProviderCommandBuffer::WebContext3D() {
|
| - DCHECK(context3d_);
|
| - DCHECK(lost_context_callback_proxy_); // Is bound to thread.
|
| - DCHECK(context_thread_checker_.CalledOnValidThread());
|
| -
|
| - return context3d_.get();
|
| -}
|
| -
|
| bool ContextProviderCommandBuffer::BindToCurrentThread() {
|
| // This is called on the thread the context will be used.
|
| DCHECK(context_thread_checker_.CalledOnValidThread());
|
| @@ -119,8 +110,12 @@
|
| return true;
|
| }
|
|
|
| -blink::WebGraphicsContext3D* ContextProviderCommandBuffer::Context3d() {
|
| - return NULL;
|
| +WebGraphicsContext3DCommandBufferImpl*
|
| +ContextProviderCommandBuffer::Context3d() {
|
| + DCHECK(lost_context_callback_proxy_); // Is bound to thread.
|
| + DCHECK(context_thread_checker_.CalledOnValidThread());
|
| +
|
| + return context3d_.get();
|
| }
|
|
|
| gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() {
|
|
|