| Index: services/ui/ws/server_window.h
|
| diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
|
| index 32a4957cc09dd382e2b03415333f03a76bada415..9e76db95f130cf264e89c3b763960ba0f50075a8 100644
|
| --- a/services/ui/ws/server_window.h
|
| +++ b/services/ui/ws/server_window.h
|
| @@ -14,6 +14,8 @@
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
| +#include "cc/ipc/display_compositor.mojom.h"
|
| +#include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "services/ui/public/interfaces/window_tree.mojom.h"
|
| #include "services/ui/ws/ids.h"
|
| @@ -58,14 +60,11 @@ class ServerWindow {
|
|
|
| // Creates a new CompositorFrameSink of the specified type, replacing the
|
| // existing.
|
| - // TODO(fsamuel): We should not be passing in |gpu_memory_buffer_manager| and
|
| - // |context_provider|. The window server should not know anything about them.
|
| - // Instead, they should be a CompositorFrameSink service-side implementation
|
| - // detail.
|
| void CreateDisplayCompositorFrameSink(
|
| gfx::AcceleratedWidget widget,
|
| cc::mojom::MojoCompositorFrameSinkRequest request,
|
| - cc::mojom::MojoCompositorFrameSinkClientPtr client);
|
| + cc::mojom::MojoCompositorFrameSinkClientPtr client,
|
| + cc::mojom::DisplayPrivateRequest display_private_request);
|
| void CreateOffscreenCompositorFrameSink(
|
| mojom::CompositorFrameSinkType compositor_frame_sink_type,
|
| cc::mojom::MojoCompositorFrameSinkRequest request,
|
|
|