| 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 b14c4a0701226049e306ba1a87febd4e1ee2146a..50fd83a4445057bfabc953647ec78e821e58ef00 100644
|
| --- a/content/renderer/gpu/compositor_output_surface.h
|
| +++ b/content/renderer/gpu/compositor_output_surface.h
|
| @@ -25,6 +25,8 @@ class Message;
|
|
|
| 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
|
| @@ -36,6 +38,7 @@ class CompositorOutputSurface
|
|
|
| CompositorOutputSurface(int32 routing_id,
|
| WebKit::WebGraphicsContext3D* context3d,
|
| + CommandBufferProxyImpl* command_buffer_proxy,
|
| cc::SoftwareOutputDevice* software);
|
| virtual ~CompositorOutputSurface();
|
|
|
| @@ -46,6 +49,7 @@ class CompositorOutputSurface
|
| virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE;
|
| virtual void SendFrameToParentCompositor(
|
| const cc::CompositorFrame&) OVERRIDE;
|
| + virtual void SetLatencyInfo(const cc::LatencyInfo&) OVERRIDE;
|
|
|
| private:
|
| class CompositorOutputSurfaceProxy :
|
| @@ -71,6 +75,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_;
|
| @@ -80,6 +85,7 @@ class CompositorOutputSurface
|
| struct Capabilities capabilities_;
|
| scoped_ptr<WebKit::WebGraphicsContext3D> context3D_;
|
| scoped_ptr<cc::SoftwareOutputDevice> software_device_;
|
| + CommandBufferProxyImpl* command_buffer_proxy_;
|
| };
|
|
|
| } // namespace content
|
|
|