Move gpu memory calculations to Compositor.

content/common/gpu/client/context_provider_command_buffer.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 
 #include <set>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 49 matching lines @@
 
 ContextProviderCommandBuffer::~ContextProviderCommandBuffer() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 
   base::AutoLock lock(main_thread_lock_);
 
   // Destroy references to the context3d_ before leaking it.
   if (context3d_->GetCommandBufferProxy()) {
     context3d_->GetCommandBufferProxy()->SetLock(nullptr);
-    context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback(
-        CommandBufferProxyImpl::MemoryAllocationChangedCallback());
   }
   lost_context_callback_proxy_.reset();
 }
 
 
 CommandBufferProxyImpl* ContextProviderCommandBuffer::GetCommandBufferProxy() {
   return context3d_->GetCommandBufferProxy();
 }
 
 WebGraphicsContext3DCommandBufferImpl*
@@ skipping 106 matching lines @@
     if (destroyed_)
       return;
     destroyed_ = true;
   }
   if (!lost_context_callback_.is_null())
     base::ResetAndReturn(&lost_context_callback_).Run();
   if (gr_context_)
     gr_context_->OnLostContext();
 }
 
 void ContextProviderCommandBuffer::OnMemoryAllocationChanged(

[piman, 2015/09/24 21:34:08]

nit: remove

[sohanjg, 2015/09/28 07:35:49]

Done.

     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() {
@@ skipping 16 matching lines @@
 }
 
 void ContextProviderCommandBuffer::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(lost_context_callback_.is_null() ||
          lost_context_callback.is_null());
   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