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

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

Issue 10267002: Revert 134428 - GpuMemoryManager suggests values for renderer Contents Texture Managers' preferred … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
===================================================================
--- content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc (revision 134478)
+++ content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc (working copy)
@@ -264,6 +264,10 @@
g_all_shared_contexts.Pointer()->insert(this);
}
+ command_buffer_->SetMemoryAllocationChangedCallback(base::Bind(
+ &WebGraphicsContext3DCommandBufferImpl::OnMemoryAllocationChanged,
+ weak_ptr_factory_.GetWeakPtr()));
+
visible_ = true;
initialized_ = true;
return true;
@@ -676,14 +680,6 @@
setMemoryAllocationChangedCallbackCHROMIUM(
WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) {
memory_allocation_changed_callback_ = callback;
-
- if (callback)
- command_buffer_->SetMemoryAllocationChangedCallback(base::Bind(
- &WebGraphicsContext3DCommandBufferImpl::OnMemoryAllocationChanged,
- weak_ptr_factory_.GetWeakPtr()));
- else
- command_buffer_->SetMemoryAllocationChangedCallback(
- base::Callback<void(const GpuMemoryAllocationForRenderer&)>());
}
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.cc ('k') | content/common/gpu/gpu_command_buffer_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698