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 ba9f0ebfbed6a6f75196c29a7bf89da933557773..4662f7cc9fd1a692237c17795007e6536ce63c6d 100644 |
--- a/content/common/gpu/client/context_provider_command_buffer.cc |
+++ b/content/common/gpu/client/context_provider_command_buffer.cc |
@@ -65,11 +65,8 @@ ContextProviderCommandBuffer::~ContextProviderCommandBuffer() { |
base::AutoLock lock(main_thread_lock_); |
// Destroy references to the context3d_ before leaking it. |
- if (context3d_->GetCommandBufferProxy()) { |
+ if (context3d_->GetCommandBufferProxy()) |
context3d_->GetCommandBufferProxy()->SetLock(nullptr); |
- context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback( |
- CommandBufferProxyImpl::MemoryAllocationChangedCallback()); |
- } |
lost_context_callback_proxy_.reset(); |
} |
@@ -195,16 +192,6 @@ void ContextProviderCommandBuffer::OnLostContext() { |
gr_context_->OnLostContext(); |
} |
-void ContextProviderCommandBuffer::OnMemoryAllocationChanged( |
- const gpu::MemoryAllocation& allocation) { |
- DCHECK(context_thread_checker_.CalledOnValidThread()); |
- |
- if (memory_policy_changed_callback_.is_null()) |
- return; |
- |
- memory_policy_changed_callback_.Run(cc::ManagedMemoryPolicy(allocation)); |
-} |
- |
void ContextProviderCommandBuffer::InitializeCapabilities() { |
Capabilities caps; |
caps.gpu = context3d_->GetImplementation()->capabilities(); |
@@ -232,19 +219,4 @@ void ContextProviderCommandBuffer::SetLostContextCallback( |
lost_context_callback_ = lost_context_callback; |
} |
-void ContextProviderCommandBuffer::SetMemoryPolicyChangedCallback( |
- const MemoryPolicyChangedCallback& memory_policy_changed_callback) { |
- DCHECK(context_thread_checker_.CalledOnValidThread()); |
- DCHECK(memory_policy_changed_callback_.is_null() || |
- memory_policy_changed_callback.is_null()); |
- memory_policy_changed_callback_ = memory_policy_changed_callback; |
- |
- if (!memory_policy_changed_callback_.is_null()) { |
- DCHECK(context3d_->GetCommandBufferProxy()); |
- context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback( |
- base::Bind(&ContextProviderCommandBuffer::OnMemoryAllocationChanged, |
- base::Unretained(this))); |
- } |
-} |
- |
-} // namespace content |
+} // namespace content |