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

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

Issue 126093010: Use ContextProvider subclass to provide WGC3D pointers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « content/common/gpu/client/context_provider_command_buffer.h ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/context_provider_command_buffer.cc
diff --git a/content/common/gpu/client/context_provider_command_buffer.cc b/content/common/gpu/client/context_provider_command_buffer.cc
index 05de2208cfdb8902df9cd7e999d7721af36582d0..f9dfef67cc34dd9df0b06811ae9bc04000df7e09 100644
--- a/content/common/gpu/client/context_provider_command_buffer.cc
+++ b/content/common/gpu/client/context_provider_command_buffer.cc
@@ -87,6 +87,15 @@ int ContextProviderCommandBuffer::GetGPUProcessID() {
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());
@@ -110,12 +119,8 @@ bool ContextProviderCommandBuffer::BindToCurrentThread() {
return true;
}
-WebGraphicsContext3DCommandBufferImpl*
-ContextProviderCommandBuffer::Context3d() {
- DCHECK(lost_context_callback_proxy_); // Is bound to thread.
- DCHECK(context_thread_checker_.CalledOnValidThread());
-
- return context3d_.get();
+blink::WebGraphicsContext3D* ContextProviderCommandBuffer::Context3d() {
+ return NULL;
}
gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() {
« no previous file with comments | « content/common/gpu/client/context_provider_command_buffer.h ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698