GpuCompositorFrameSink implements cc::mojom::DisplayPrivate

services/ui/ws/server_window_compositor_frame_sink_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 
 #include "cc/ipc/display_compositor.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
@@ skipping 20 matching lines @@
   waiting_for_initial_frames_ = !IsCompositorFrameSinkReadyAndNonEmpty(
                                     mojom::CompositorFrameSinkType::DEFAULT) ||
                                 !IsCompositorFrameSinkReadyAndNonEmpty(
                                     mojom::CompositorFrameSinkType::UNDERLAY);
   return !waiting_for_initial_frames_;
 }
 
 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::DisplayPrivatePtr display_private,

[Fady Samuel, 2016/12/16 05:29:39]

don't pass this in

[Alex Z., 2016/12/16 16:42:00]

Done.

+    cc::mojom::DisplayPrivateRequest display_request) {

[Fady Samuel, 2016/12/16 05:29:39]

display_private_request

[Alex Z., 2016/12/16 16:42:00]

Done.

+  display_private_ = std::move(display_private);

[Fady Samuel, 2016/12/16 05:29:39]

don't store this.

[Alex Z., 2016/12/16 16:42:00]

Done.

+  CreateCompositorFrameSinkInternal(
+      mojom::CompositorFrameSinkType::DEFAULT, widget, std::move(request),
+      std::move(client), std::move(display_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(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
     const cc::FrameSinkId& frame_sink_id) {
   auto it = type_to_compositor_frame_sink_map_.find(compositor_frame_sink_type);
   if (it != type_to_compositor_frame_sink_map_.end()) {
     it->second.compositor_frame_sink->AddChildFrameSink(frame_sink_id);
     return;
   }
@@ skipping 61 matching lines @@
   const gfx::Size& latest_submitted_frame_size =
       iter->second.latest_submitted_frame_size;
   return latest_submitted_frame_size.width() >= window_->bounds().width() &&
          latest_submitted_frame_size.height() >= window_->bounds().height();
 }
 
 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_request) {
   cc::FrameSinkId frame_sink_id(
       WindowIdToTransportId(window_->id()),
       static_cast<uint32_t>(compositor_frame_sink_type));
   CompositorFrameSinkData& data =
       type_to_compositor_frame_sink_map_[compositor_frame_sink_type];
   cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request;
   if (data.pending_compositor_frame_sink_request.is_pending()) {
     private_request = std::move(data.pending_compositor_frame_sink_request);
   } else {
     private_request = mojo::GetProxy(&data.compositor_frame_sink);
   }
 
   if (widget != gfx::kNullAcceleratedWidget) {
     // TODO(fsamuel): AcceleratedWidget cannot be transported over IPC for Mac
     // or Android. We should instead use GpuSurfaceTracker here on those
     // platforms.
     window_->delegate()
         ->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_request));

[Fady Samuel, 2016/12/16 05:29:39]

nit: display_private_request

[Alex Z., 2016/12/16 16:42:00]

Done.

   } else {
     window_->delegate()
         ->GetDisplayCompositor()
         ->CreateOffscreenCompositorFrameSink(frame_sink_id, std::move(request),
                                              std::move(private_request),
                                              std::move(client));
   }
 
   if (window_->parent()) {
     window_->delegate()
@@ skipping 15 matching lines @@
 
 CompositorFrameSinkData& CompositorFrameSinkData::operator=(
     CompositorFrameSinkData&& other) {
   latest_submitted_surface_id = other.latest_submitted_surface_id;
   compositor_frame_sink = std::move(other.compositor_frame_sink);
   return *this;
 }
 
 }  // namespace ws
 }  // namespace ui