DirectCompositorFrameSink Uses CompositorFrameSinkSupport

components/display_compositor/gpu_compositor_frame_sink.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 "components/display_compositor/gpu_compositor_frame_sink.h"
 
 #include "cc/surfaces/surface_reference.h"
 
 namespace display_compositor {
 
 GpuCompositorFrameSink::GpuCompositorFrameSink(
     GpuCompositorFrameSinkDelegate* delegate,
     cc::SurfaceManager* surface_manager,
     const cc::FrameSinkId& frame_sink_id,
     std::unique_ptr<cc::Display> display,
     std::unique_ptr<cc::BeginFrameSource> begin_frame_source,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest
         compositor_frame_sink_private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client)
     : delegate_(delegate),
-      support_(this,
-               surface_manager,
-               frame_sink_id,
-               std::move(display),
-               std::move(begin_frame_source)),
+      support_(this, surface_manager, frame_sink_id, display.get()),
       surface_manager_(surface_manager),
+      display_(std::move(display)),

[Fady Samuel, 2017/01/29 15:43:01]

Move to GpuDisplayCompositorFrameSInk

[Alex Z., 2017/01/30 20:37:49]

Done.

+      display_begin_frame_source_(std::move(begin_frame_source)),

[Fady Samuel, 2017/01/29 15:43:01]

Move to GpuDisplayCompositorFrameSInk

[Alex Z., 2017/01/30 20:37:49]

Done.

+
       surface_tracker_(frame_sink_id),
       client_(std::move(client)),
       compositor_frame_sink_private_binding_(
           this,
           std::move(compositor_frame_sink_private_request)) {
   compositor_frame_sink_private_binding_.set_connection_error_handler(
       base::Bind(&GpuCompositorFrameSink::OnPrivateConnectionLost,
                  base::Unretained(this)));
+
+  if (display_.get())
+    display_->SetVisible(true);

[Fady Samuel, 2017/01/29 15:43:01]

Move to GpuDisplayCompositorFrameSink. No need to check if we have a display
there.

[Alex Z., 2017/01/30 20:37:49]

Done.

 }
 
 GpuCompositorFrameSink::~GpuCompositorFrameSink() {
   // For display root surfaces, remove the reference from top level root to
   // indicate the display root surface is no longer visible.
   if (support_.display() && surface_tracker_.current_surface_id().is_valid()) {
     const cc::SurfaceId top_level_root_surface_id =
         surface_manager_->GetRootSurfaceId();
     std::vector<cc::SurfaceReference> references_to_remove{cc::SurfaceReference(
         top_level_root_surface_id, surface_tracker_.current_surface_id())};
@@ skipping 99 matching lines @@
 }
 
 void GpuCompositorFrameSink::OnPrivateConnectionLost() {
   private_connection_lost_ = true;
   // Request destruction of |this| only if both connections are lost.
   delegate_->OnPrivateConnectionLost(support_.frame_sink_id(),
                                      client_connection_lost_);
 }
 
 }  // namespace display_compositor