DirectCompositorFrameSink Uses CompositorFrameSinkSupport

components/display_compositor/gpu_compositor_frame_sink.h

 // 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.
 
 #ifndef COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_
 #define COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 53 matching lines @@
   cc::CompositorFrameSinkSupport support_;
   cc::SurfaceManager* const surface_manager_;
 
  private:
   // cc::CompositorFrameSinkSupportClient implementation:
   void DidReceiveCompositorFrameAck() override;
   void OnBeginFrame(const cc::BeginFrameArgs& args) override;
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
   void WillDrawSurface() override;
 
+  // GpuCompositorFrameSink holds a Display and its BeginFrameSource if it
+  // created with non-null gpu::SurfaceHandle. In the window server, the display
+  // root window's CompositorFrameSink will have a valid gpu::SurfaceHandle.
+  std::unique_ptr<cc::Display> display_;

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

Move this to GpuDisplayCompositorFrameSink. The comment above becomes irrelevant
because by definition a GpuDisplayCompositorFrameSink has a display.

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

Done.

+  std::unique_ptr<cc::BeginFrameSource> display_begin_frame_source_;

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

Move this to GpuDisplayCompositorFrameSink.

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

Done.

+
   // Track the surface references for the surface corresponding to this
   // compositor frame sink.
   cc::ReferencedSurfaceTracker surface_tracker_;
 
   bool client_connection_lost_ = false;
   bool private_connection_lost_ = false;
 
   cc::mojom::MojoCompositorFrameSinkClientPtr client_;
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate>
       compositor_frame_sink_private_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink);
 };
 
 }  // namespace display_compositor
 
 #endif  // COMPONENTS_DISPLAY_COMPOSITOR_GPU_COMPOSITOR_FRAME_SINK_H_