| 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 57b344ae5ed9b2b773b5e1c6adbef1879ee3ccb5..521daea222a5290a984af54bed6e28804258e09e 100644
|
| --- a/content/renderer/gpu/compositor_output_surface.h
|
| +++ b/content/renderer/gpu/compositor_output_surface.h
|
| @@ -23,6 +23,10 @@ class ForwardingMessageFilter;
|
| class Message;
|
| }
|
|
|
| +namespace cc {
|
| +class CompositorFrameAck;
|
| +}
|
| +
|
| namespace content {
|
|
|
| // This class can be created only on the main thread, but then becomes pinned
|
| @@ -36,7 +40,8 @@ class CompositorOutputSurface
|
|
|
| CompositorOutputSurface(int32 routing_id,
|
| WebKit::WebGraphicsContext3D* context3d,
|
| - cc::SoftwareOutputDevice* software);
|
| + cc::SoftwareOutputDevice* software,
|
| + bool renderToMailbox);
|
| virtual ~CompositorOutputSurface();
|
|
|
| // cc::OutputSurface implementation.
|
| @@ -70,6 +75,7 @@ class CompositorOutputSurface
|
| void OnMessageReceived(const IPC::Message& message);
|
| void OnUpdateVSyncParameters(
|
| base::TimeTicks timebase, base::TimeDelta interval);
|
| + void OnSwapAck(const cc::CompositorFrameAck& ack);
|
| bool Send(IPC::Message* message);
|
|
|
| scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_;
|
|
|