Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

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_manager.h"
 #include "cc/surfaces/surface_reference.h"
 
 namespace display_compositor {
 
 GpuCompositorFrameSink::GpuCompositorFrameSink(
     GpuCompositorFrameSinkDelegate* delegate,
     cc::SurfaceManager* surface_manager,
     const cc::FrameSinkId& frame_sink_id,
-    cc::Display* display,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest
         compositor_frame_sink_private_request,
-    cc::mojom::MojoCompositorFrameSinkClientPtr client)
+    cc::mojom::MojoCompositorFrameSinkClientPtr client,
+    bool has_display)
     : delegate_(delegate),
       support_(this,
                surface_manager,

[danakj, 2017/02/08 19:23:38]

Pointing out that this class has a lot of constructor params that are only there
to forward to the support, and it should probably take a support as an argument
instead.

[Alex Z., 2017/02/08 21:26:47]

Done.

                frame_sink_id,
-               display,
                true /* handles_frame_sink_id_invalidation */,
-               true /* needs_sync_points */),
+               true /* needs_sync_points */,
+               has_display),
       surface_manager_(surface_manager),
       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)));
 }
 
@@ skipping 61 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