DirectCompositorFrameSink Uses CompositorFrameSinkSupport

components/display_compositor/gpu_compositor_frame_sink.h

Index: components/display_compositor/gpu_compositor_frame_sink.h
diff --git a/components/display_compositor/gpu_compositor_frame_sink.h b/components/display_compositor/gpu_compositor_frame_sink.h
index 2ccac2927d027732dbea242f5eca835e27e92e72..a984ccd6ed85971738976f0d5bdc7746b067a0be 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.h
+++ b/components/display_compositor/gpu_compositor_frame_sink.h
@@ -71,6 +71,12 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
   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_;