Chromium Code Reviews| Index: content/common/gpu/gpu_channel.h |
| diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h |
| index acaae1ac2fc0180fd7161efb94f7f6707c664766..440244fe140d337f086df4c02d3909cf84c49847 100644 |
| --- a/content/common/gpu/gpu_channel.h |
| +++ b/content/common/gpu/gpu_channel.h |
| @@ -35,6 +35,7 @@ class WaitableEvent; |
| namespace gpu { |
| struct RefCountedCounter; |
| +class ShaderCache; |
|
greggman
2012/06/15 08:10:24
Should these be named ProgramCache and MemoryProgr
dmurph
2012/06/19 01:08:33
Done.
|
| } |
| // Encapsulates an IPC channel between the GPU process and one renderer |
| @@ -49,7 +50,8 @@ class GpuChannel : public IPC::Channel::Listener, |
| gfx::GLShareGroup* share_group, |
| gpu::gles2::MailboxManager* mailbox_manager, |
| int client_id, |
| - bool software); |
| + bool software, |
| + base::WeakPtr<gpu::ShaderCache> shader_cache); |
| bool Init(base::MessageLoopProxy* io_message_loop, |
| base::WaitableEvent* shutdown_event); |
| @@ -141,6 +143,8 @@ class GpuChannel : public IPC::Channel::Listener, |
| // are destroyed. So a raw pointer is safe. |
| GpuChannelManager* gpu_channel_manager_; |
| + base::WeakPtr<gpu::ShaderCache> shader_cache_; |
|
greggman
2012/06/15 08:10:24
Does this really need to be a weak ptr? Usually we
dmurph
2012/06/15 16:40:23
Yes, but I would argue that it's
1. Better design,
|
| + |
| scoped_ptr<IPC::SyncChannel> channel_; |
| // Number of routed messages for pending processing on a stub. |