Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Unified Diff: trunk/src/content/common/gpu/client/context_provider_command_buffer.cc

Issue 136273002: Revert 244383 "Use ContextProvider subclass to provide WGC3D poi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « trunk/src/content/common/gpu/client/context_provider_command_buffer.h ('k') | trunk/src/content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698