GpuCompositorFrameSink implements cc::mojom::DisplayPrivate

services/ui/ws/server_window_compositor_frame_sink_manager.cc

Index: services/ui/ws/server_window_compositor_frame_sink_manager.cc
diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.cc b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
index 51091085e78f7173968a0d00ce72a8d85a6461ec..4812e6bb9c9baa80d8a6bad08fadd6a95edbea6a 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.cc
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
@@ -38,19 +38,20 @@ bool ServerWindowCompositorFrameSinkManager::ShouldDraw() {
 void ServerWindowCompositorFrameSinkManager::CreateDisplayCompositorFrameSink(
     gfx::AcceleratedWidget widget,
     cc::mojom::MojoCompositorFrameSinkRequest request,
-    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
-  CreateCompositorFrameSinkInternal(mojom::CompositorFrameSinkType::DEFAULT,
-                                    widget, std::move(request),
-                                    std::move(client));
+    cc::mojom::MojoCompositorFrameSinkClientPtr client,
+    cc::mojom::DisplayPrivateRequest display_private_request) {
+  CreateCompositorFrameSinkInternal(
+      mojom::CompositorFrameSinkType::DEFAULT, widget, std::move(request),
+      std::move(client), std::move(display_private_request));
 }
 
 void ServerWindowCompositorFrameSinkManager::CreateOffscreenCompositorFrameSink(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
-  CreateCompositorFrameSinkInternal(compositor_frame_sink_type,
-                                    gfx::kNullAcceleratedWidget,
-                                    std::move(request), std::move(client));
+  CreateCompositorFrameSinkInternal(
+      compositor_frame_sink_type, gfx::kNullAcceleratedWidget,
+      std::move(request), std::move(client), nullptr);
 }
 
 void ServerWindowCompositorFrameSinkManager::AddChildFrameSinkId(
@@ -147,7 +148,8 @@ void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSinkInternal(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
     gfx::AcceleratedWidget widget,
     cc::mojom::MojoCompositorFrameSinkRequest request,
-    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
+    cc::mojom::MojoCompositorFrameSinkClientPtr client,
+    cc::mojom::DisplayPrivateRequest display_private_request) {
   cc::FrameSinkId frame_sink_id(
       WindowIdToTransportId(window_->id()),
       static_cast<uint32_t>(compositor_frame_sink_type));
@@ -169,7 +171,8 @@ void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSinkInternal(
         ->GetDisplayCompositor()
         ->CreateDisplayCompositorFrameSink(
             frame_sink_id, widget, std::move(request),
-            std::move(private_request), std::move(client));
+            std::move(private_request), std::move(client),
+            std::move(display_private_request));

[msw, 2016/12/19 20:18:11]

q: Should the else case DCHECK(!display_private_request)? (it's ignored)

[Fady Samuel, 2016/12/19 20:20:18]

Sounds reasonable.

[Alex Z., 2016/12/19 20:53:29]

Done.

   } else {
     window_->delegate()
         ->GetDisplayCompositor()