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 bfe1e9ad240b189864af28f7d869a7b0f9488514..17f034df45d7591a48f2a122b6f1d1a969cc1e65 100644
--- a/services/ui/surfaces/gpu_compositor_frame_sink.h
+++ b/services/ui/surfaces/gpu_compositor_frame_sink.h
@@ -69,6 +69,12 @@ class 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_;
+  std::unique_ptr<cc::BeginFrameSource> display_begin_frame_source_;
+
   // Track the surface references for the surface corresponding to this
   // compositor frame sink.
   cc::ReferencedSurfaceTracker surface_tracker_;