| Index: services/ui/ws/gpu_compositor_frame_sink.h
|
| diff --git a/services/ui/ws/gpu_compositor_frame_sink.h b/services/ui/ws/gpu_compositor_frame_sink.h
|
| index 18fdb0804b61e25ea7ac75dd25b64dbab46a37f5..546c6058ed8b10afe4d0e1db14d8557b6d03e99c 100644
|
| --- a/services/ui/ws/gpu_compositor_frame_sink.h
|
| +++ b/services/ui/ws/gpu_compositor_frame_sink.h
|
| @@ -62,7 +62,8 @@ class GpuCompositorFrameSink : public cc::mojom::MojoCompositorFrameSink,
|
|
|
| // cc::mojom::MojoCompositorFrameSink:
|
| void SetNeedsBeginFrame(bool needs_begin_frame) override;
|
| - void SubmitCompositorFrame(cc::CompositorFrame frame) override;
|
| + void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id,
|
| + cc::CompositorFrame frame) override;
|
|
|
| // cc::mojom::MojoCompositorFrameSinkPrivate:
|
| void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
|
| @@ -101,14 +102,12 @@ class GpuCompositorFrameSink : public cc::mojom::MojoCompositorFrameSink,
|
| // GpuCompositorFrameSink.
|
| scoped_refptr<DisplayCompositor> display_compositor_;
|
|
|
| - gfx::Size last_submitted_frame_size_;
|
| // GpuCompositorFrameSink holds a cc::Display if it created with
|
| // non-null gfx::AcceleratedWidget. In the window server, the display root
|
| // window's CompositorFrameSink will have a valid gfx::AcceleratedWidget.
|
| std::unique_ptr<cc::Display> display_;
|
|
|
| cc::LocalFrameId local_frame_id_;
|
| - cc::SurfaceIdAllocator surface_id_allocator_;
|
| cc::SurfaceFactory surface_factory_;
|
| // Counts the number of CompositorFrames that have been submitted and have not
|
| // yet received an ACK.
|
|
|