| Index: services/ui/surfaces/display_compositor.h
|
| diff --git a/services/ui/surfaces/display_compositor.h b/services/ui/surfaces/display_compositor.h
|
| index 1233609364270f91920af2e7fe93a77ab0f54f5b..48e25a7671c9505196a2537c3f515b223db19897 100644
|
| --- a/services/ui/surfaces/display_compositor.h
|
| +++ b/services/ui/surfaces/display_compositor.h
|
| @@ -83,12 +83,17 @@ class DisplayCompositor : public cc::SurfaceObserver,
|
| bool destroy_compositor_frame_sink);
|
|
|
| // cc::mojom::DisplayCompositor implementation:
|
| - void CreateCompositorFrameSink(
|
| + void CreateDisplayCompositorFrameSink(
|
| const cc::FrameSinkId& frame_sink_id,
|
| gpu::SurfaceHandle surface_handle,
|
| cc::mojom::MojoCompositorFrameSinkRequest request,
|
| cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
|
| cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
|
| + void CreateOffscreenCompositorFrameSink(
|
| + const cc::FrameSinkId& frame_sink_id,
|
| + cc::mojom::MojoCompositorFrameSinkRequest request,
|
| + cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
|
| + cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
|
|
|
| private:
|
| friend class test::DisplayCompositorTest;
|
| @@ -101,6 +106,15 @@ class DisplayCompositor : public cc::SurfaceObserver,
|
| gpu::SurfaceHandle surface_handle,
|
| cc::SyntheticBeginFrameSource* begin_frame_source);
|
|
|
| + void CreateCompositorFrameSinkInternal(
|
| + const cc::FrameSinkId& frame_sink_id,
|
| + gpu::SurfaceHandle surface_handle,
|
| + std::unique_ptr<cc::Display> display,
|
| + std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source,
|
| + cc::mojom::MojoCompositorFrameSinkRequest request,
|
| + cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
|
| + cc::mojom::MojoCompositorFrameSinkClientPtr client);
|
| +
|
| const cc::SurfaceId& GetRootSurfaceId() const;
|
|
|
| // cc::SurfaceObserver implementation.
|
|
|