DirectCompositorFrameSink Uses CompositorFrameSinkSupport

services/ui/surfaces/gpu_compositor_frame_sink.h

Index: services/ui/surfaces/gpu_compositor_frame_sink.h
diff --git a/services/ui/surfaces/gpu_compositor_frame_sink.h b/services/ui/surfaces/gpu_compositor_frame_sink.h
index c2a80bc9888444c2665e20ba68220bfa025fcf44..19fa30957043daca58d7fdf5ec4077898dc163ec 100644
--- a/services/ui/surfaces/gpu_compositor_frame_sink.h
+++ b/services/ui/surfaces/gpu_compositor_frame_sink.h
@@ -80,6 +80,11 @@ class GpuCompositorFrameSink : public cc::CompositorFrameSinkSupportClient,
 
   DisplayCompositor* const display_compositor_;
 
+  // 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_;
+  std::unique_ptr<cc::BeginFrameSource> display_begin_frame_source_;
   cc::CompositorFrameSinkSupport support_;
 
   // Track the surface references for the surface corresponding to this