| Index: content/common/gpu/gpu_command_buffer_stub.h
|
| diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
|
| index 6766d8732e5e92bfa9b63fea374926686f7d121f..e4c95259c262d7c834b8fb4239360a58a19c298b 100644
|
| --- a/content/common/gpu/gpu_command_buffer_stub.h
|
| +++ b/content/common/gpu/gpu_command_buffer_stub.h
|
| @@ -54,6 +54,9 @@ class GpuCommandBufferStub
|
| // Get the GLContext associated with this object.
|
| gpu::GpuScheduler* scheduler() const { return scheduler_.get(); }
|
|
|
| + // Get the GpuChannel associated with this object.
|
| + GpuChannel* channel() const { return channel_; }
|
| +
|
| // Identifies the renderer process.
|
| int32 renderer_id() const { return renderer_id_; }
|
|
|
| @@ -77,15 +80,10 @@ class GpuCommandBufferStub
|
|
|
| void ViewResized();
|
|
|
| -#if defined(TOUCH_UI)
|
| - void AcceleratedSurfaceIOSurfaceSet(uint64 surface_id);
|
| - void AcceleratedSurfaceReleased(uint64 surface_id);
|
| -#endif // defined(TOUCH_UI)
|
| -
|
| -#if defined(OS_MACOSX) || defined(TOUCH_UI)
|
| +#if defined(OS_MACOSX)
|
| // Called only by the GpuChannel.
|
| void AcceleratedSurfaceBuffersSwapped(uint64 swap_buffers_count);
|
| -#endif // defined(OS_MACOSX) || defined(TOUCH_UI)
|
| +#endif // defined(OS_MACOSX)
|
|
|
| // Called when the command buffer was destroyed, and the stub should now
|
| // unblock itself and handle pending messages.
|
| @@ -97,6 +95,9 @@ class GpuCommandBufferStub
|
| void AddSetTokenCallback(const base::Callback<void(int32)>& callback);
|
|
|
| private:
|
| + // Cleans up and sends reply if OnInitialize failed.
|
| + void OnInitializeFailed(IPC::Message* reply_message);
|
| +
|
| // Message handlers:
|
| void OnInitialize(base::SharedMemoryHandle ring_buffer,
|
| int32 size,
|
| @@ -132,11 +133,8 @@ class GpuCommandBufferStub
|
|
|
| #if defined(OS_MACOSX)
|
| void OnSetWindowSize(const gfx::Size& size);
|
| -#endif // defined(OS_MACOSX)
|
| -
|
| -#if defined(OS_MACOSX) || defined(TOUCH_UI)
|
| void SwapBuffersCallback();
|
| -#endif // defined(TOUCH_UI)
|
| +#endif // defined(OS_MACOSX)
|
|
|
| void ResizeCallback(gfx::Size size);
|
| void ReportState();
|
|
|