DirectCompositorFrameSink Uses CompositorFrameSinkSupport

services/ui/surfaces/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 "services/ui/surfaces/gpu_compositor_frame_sink.h"
 
 #include "services/ui/surfaces/display_compositor.h"
 
 namespace ui {
 
 GpuCompositorFrameSink::GpuCompositorFrameSink(
     DisplayCompositor* display_compositor,
     const cc::FrameSinkId& frame_sink_id,
     std::unique_ptr<cc::Display> display,
     std::unique_ptr<cc::BeginFrameSource> begin_frame_source,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest
         compositor_frame_sink_private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::DisplayPrivateRequest display_private_request)
     : display_compositor_(display_compositor),
+      display_(std::move(display)),
       support_(this,
                display_compositor->manager(),
                frame_sink_id,
-               std::move(display),
+               display_.get(),
                std::move(begin_frame_source)),
       client_(std::move(client)),
       binding_(this, std::move(request)),
       compositor_frame_sink_private_binding_(
           this,
           std::move(compositor_frame_sink_private_request)),
       display_private_binding_(this, std::move(display_private_request)) {
+  support_.display()->SetVisible(true);
+  support_.RegisterFrameSinkId();
   binding_.set_connection_error_handler(base::Bind(
       &GpuCompositorFrameSink::OnClientConnectionLost, base::Unretained(this)));
 
   compositor_frame_sink_private_binding_.set_connection_error_handler(
       base::Bind(&GpuCompositorFrameSink::OnPrivateConnectionLost,
                  base::Unretained(this)));
 }
 
-GpuCompositorFrameSink::~GpuCompositorFrameSink() {}
+GpuCompositorFrameSink::~GpuCompositorFrameSink() {
+  support_.InvalidateFrameSinkId();
+}
 
 void GpuCompositorFrameSink::EvictFrame() {
   support_.EvictFrame();
 }
 
 void GpuCompositorFrameSink::SetNeedsBeginFrame(bool needs_begin_frame) {
   support_.SetNeedsBeginFrame(needs_begin_frame);
 }
 
 void GpuCompositorFrameSink::SubmitCompositorFrame(
@@ skipping 81 matching lines @@
 }
 
 void GpuCompositorFrameSink::OnPrivateConnectionLost() {
   private_connection_lost_ = true;
   // Request destruction of |this| only if both connections are lost.
   display_compositor_->OnCompositorFrameSinkPrivateConnectionLost(
       support_.frame_sink_id(), client_connection_lost_);
 }
 
 }  // namespace ui