| Index: content/renderer/gpu/compositor_output_surface.h
|
| diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
|
| index 896325c462b84faaf03d62c4867a6e3e89f14d6d..76fa6b6bf8858c1c77f044f1c1b91e9433cd0ba8 100644
|
| --- a/content/renderer/gpu/compositor_output_surface.h
|
| +++ b/content/renderer/gpu/compositor_output_surface.h
|
| @@ -29,6 +29,8 @@ class CompositorFrameAck;
|
|
|
| namespace content {
|
|
|
| +class CommandBufferProxyImpl;
|
| +
|
| // This class can be created only on the main thread, but then becomes pinned
|
| // to a fixed thread when bindToClient is called.
|
| class CompositorOutputSurface
|
| @@ -40,12 +42,14 @@ class CompositorOutputSurface
|
|
|
| CompositorOutputSurface(int32 routing_id,
|
| WebKit::WebGraphicsContext3D* context3d,
|
| + CommandBufferProxyImpl* command_buffer_proxy,
|
| cc::SoftwareOutputDevice* software);
|
| virtual ~CompositorOutputSurface();
|
|
|
| // cc::OutputSurface implementation.
|
| virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE;
|
| virtual void SendFrameToParentCompositor(cc::CompositorFrame*) OVERRIDE;
|
| + virtual void SetLatencyInfo(const cc::LatencyInfo&) OVERRIDE;
|
|
|
| // TODO(epenner): This seems out of place here and would be a better fit
|
| // int CompositorThread after it is fully refactored (http://crbug/170828)
|
| @@ -78,6 +82,7 @@ class CompositorOutputSurface
|
| void OnMessageReceived(const IPC::Message& message);
|
| void OnUpdateVSyncParameters(
|
| base::TimeTicks timebase, base::TimeDelta interval);
|
| + void OnReceivedLatencyInfo(const cc::LatencyInfo&);
|
| bool Send(IPC::Message* message);
|
|
|
| scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_;
|
| @@ -85,6 +90,7 @@ class CompositorOutputSurface
|
| int routing_id_;
|
| bool prefers_smoothness_;
|
| base::PlatformThreadId main_thread_id_;
|
| + CommandBufferProxyImpl* command_buffer_proxy_;
|
| };
|
|
|
| } // namespace content
|
|
|