| Index: gpu/command_buffer/service/in_process_command_buffer.h
|
| diff --git a/gpu/command_buffer/service/in_process_command_buffer.h b/gpu/command_buffer/service/in_process_command_buffer.h
|
| index af3956a29b312f72247ea789ff083df5d8bb98b0..a743f8e1eb2e90dd4c1ab822eb3fb1915310d1f4 100644
|
| --- a/gpu/command_buffer/service/in_process_command_buffer.h
|
| +++ b/gpu/command_buffer/service/in_process_command_buffer.h
|
| @@ -92,7 +92,6 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| const gfx::Size& size,
|
| const std::vector<int32_t>& attribs,
|
| gfx::GpuPreference gpu_preference,
|
| - const base::Closure& context_lost_callback,
|
| InProcessCommandBuffer* share_group,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| ImageFactory* image_factory);
|
| @@ -113,6 +112,8 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| gpu::error::Error GetLastError() override;
|
|
|
| // GpuControl implementation:
|
| + // NOTE: The GpuControlClient will be called on the GPU thread.
|
| + void SetGpuControlClient(GpuControlClient*) override;
|
| gpu::Capabilities GetCapabilities() override;
|
| int32_t CreateImage(ClientBuffer buffer,
|
| size_t width,
|
| @@ -249,6 +250,7 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
|
|
| // Members accessed on the gpu thread (possibly with the exception of
|
| // creation):
|
| + GpuControlClient* gpu_control_client_;
|
| bool context_lost_;
|
| scoped_refptr<TransferBufferManagerInterface> transfer_buffer_manager_;
|
| scoped_ptr<CommandExecutor> executor_;
|
|
|