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

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

Issue 1459193003: Fix thread checking logic in ContextProviderCommandBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | no next file » | 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 ba1baa9be5fd45aee51f58b752b365475af40e95..881a138671b826900953ccbfc32e267b3d3a82a6 100644
--- a/content/common/gpu/client/context_provider_command_buffer.cc
+++ b/content/common/gpu/client/context_provider_command_buffer.cc
@@ -68,7 +68,7 @@ ContextProviderCommandBuffer::~ContextProviderCommandBuffer() {
CommandBufferProxyImpl* ContextProviderCommandBuffer::GetCommandBufferProxy() {
- return WebContext3D()->GetCommandBufferProxy();
+ return WebContext3DNoChecks()->GetCommandBufferProxy();
}
WebGraphicsContext3DCommandBufferImpl*
@@ -119,11 +119,11 @@ void ContextProviderCommandBuffer::DetachFromThread() {
gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() {
DCHECK(lost_context_callback_proxy_); // Is bound to thread.
- return WebContext3DNoChecks()->GetImplementation();
+ return WebContext3D()->GetImplementation();
}
gpu::ContextSupport* ContextProviderCommandBuffer::ContextSupport() {
- return WebContext3D()->GetContextSupport();
+ return WebContext3DNoChecks()->GetContextSupport();
}
class GrContext* ContextProviderCommandBuffer::GrContext() {
@@ -152,7 +152,7 @@ void ContextProviderCommandBuffer::InvalidateGrContext(uint32_t state) {
}
void ContextProviderCommandBuffer::SetupLock() {
- WebContext3D()->GetCommandBufferProxy()->SetLock(&context_lock_);
+ WebContext3DNoChecks()->GetCommandBufferProxy()->SetLock(&context_lock_);
piman 2015/11/20 04:54:35 I think this one should stay as WebContext3D(), be
}
base::Lock* ContextProviderCommandBuffer::GetLock() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698