| Index: content/common/gpu/gpu_channel_manager.h
|
| diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
|
| index 65eb1f1340f5415acb202a46b7a14e0dcdae31a8..31276bd40c5c6d3c16bdccc8008903a56f603de8 100644
|
| --- a/content/common/gpu/gpu_channel_manager.h
|
| +++ b/content/common/gpu/gpu_channel_manager.h
|
| @@ -41,6 +41,8 @@ class ShaderTranslatorCache;
|
|
|
| namespace IPC {
|
| struct ChannelHandle;
|
| +class SyncChannel;
|
| +class MessageFilter;
|
| }
|
|
|
| struct GPUCreateCommandBufferConfig;
|
| @@ -61,7 +63,8 @@ class GpuChannelManager : public IPC::Listener,
|
| GpuChannelManager(MessageRouter* router,
|
| GpuWatchdog* watchdog,
|
| base::MessageLoopProxy* io_message_loop,
|
| - base::WaitableEvent* shutdown_event);
|
| + base::WaitableEvent* shutdown_event,
|
| + IPC::SyncChannel* channel);
|
| virtual ~GpuChannelManager();
|
|
|
| // Remove the channel for a particular renderer.
|
| @@ -128,15 +131,8 @@ class GpuChannelManager : public IPC::Listener,
|
| const GPUCreateCommandBufferConfig& init_params,
|
| int32 route_id);
|
| void OnLoadedShader(std::string shader);
|
| - void CreateGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
|
| - const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage);
|
| - void OnCreateGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
|
| - const gfx::Size& size,
|
| - unsigned internalformat,
|
| - unsigned usage);
|
| void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle);
|
| + void DestroyGpuMemoryBufferOnIO(const gfx::GpuMemoryBufferHandle& handle);
|
| void OnDestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
|
| int32 sync_point);
|
| void OnDestroyGpuMemoryBufferSyncPointRetired(
|
| @@ -165,6 +161,8 @@ class GpuChannelManager : public IPC::Listener,
|
| scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
|
| GpuMemoryBufferOperationQueue gpu_memory_buffer_operations_;
|
| scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
|
| + IPC::SyncChannel* channel_;
|
| + scoped_refptr<IPC::MessageFilter> filter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
|
| };
|
|
|