| Index: content/common/gpu/gpu_channel_manager.cc
|
| diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
|
| index 9c12d1a321cc6608532e15bcffcff45f2bdb4f63..8122db12a39639b205a68f2d8fc7e0aae436e869 100644
|
| --- a/content/common/gpu/gpu_channel_manager.cc
|
| +++ b/content/common/gpu/gpu_channel_manager.cc
|
| @@ -8,6 +8,7 @@
|
| #include "content/common/child_thread.h"
|
| #include "content/common/gpu/gpu_channel.h"
|
| #include "content/common/gpu/gpu_messages.h"
|
| +#include "content/common/gpu/gpu_memory_manager.h"
|
|
|
| GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread,
|
| GpuWatchdog* watchdog,
|
| @@ -17,6 +18,8 @@ GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread,
|
| io_message_loop_(io_message_loop),
|
| shutdown_event_(shutdown_event),
|
| gpu_child_thread_(gpu_child_thread),
|
| + ALLOW_THIS_IN_INITIALIZER_LIST(gpu_memory_manager_(this,
|
| + GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit)),
|
| watchdog_(watchdog) {
|
| DCHECK(gpu_child_thread);
|
| DCHECK(io_message_loop);
|
| @@ -53,6 +56,15 @@ GpuChannel* GpuChannelManager::LookupChannel(int32 client_id) {
|
| return iter->second;
|
| }
|
|
|
| +void GpuChannelManager::AppendAllCommandBufferStubs(
|
| + std::vector<GpuCommandBufferStubBase*>& stubs) {
|
| + for (GpuChannelMap::const_iterator it = gpu_channels_.begin();
|
| + it != gpu_channels_.end(); ++it ) {
|
| + it->second->AppendAllCommandBufferStubs(stubs);
|
| + }
|
| +
|
| +}
|
| +
|
| bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) {
|
| bool msg_is_ok = true;
|
| bool handled = true;
|
|
|