Index: cc/surfaces/compositor_frame_sink_support.h |
diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h |
index d841a7f26628192efd090540201e56c4e8c93504..545dd6042627924952214b4e6f237e72fc7cc16d 100644 |
--- a/cc/surfaces/compositor_frame_sink_support.h |
+++ b/cc/surfaces/compositor_frame_sink_support.h |
@@ -26,12 +26,10 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport |
public SurfaceFactoryClient, |
public BeginFrameObserver { |
public: |
- CompositorFrameSinkSupport( |
- CompositorFrameSinkSupportClient* client, |
- SurfaceManager* surface_manager, |
- const FrameSinkId& frame_sink_id, |
- std::unique_ptr<Display> display, |
- std::unique_ptr<BeginFrameSource> display_begin_frame_source); |
+ CompositorFrameSinkSupport(CompositorFrameSinkSupportClient* client, |
+ SurfaceManager* surface_manager, |
+ const FrameSinkId& frame_sink_id, |
+ Display* display); |
~CompositorFrameSinkSupport() override; |
@@ -46,8 +44,10 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport |
void Satisfy(const SurfaceSequence& sequence); |
void AddChildFrameSink(const FrameSinkId& child_frame_sink_id); |
void RemoveChildFrameSink(const FrameSinkId& child_frame_sink_id); |
+ void SetNeedsSyncPoints(bool needs_sync_points); |
+ void ForceReclaimResources(); |
- Display* display() { return display_.get(); } |
+ Display* display() { return display_; } |
private: |
void DidReceiveCompositorFrameAck(); |
@@ -77,11 +77,7 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport |
const FrameSinkId frame_sink_id_; |
- // 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<BeginFrameSource> display_begin_frame_source_; |
- std::unique_ptr<Display> display_; |
+ Display* display_; |
SurfaceFactory surface_factory_; |
// Counts the number of CompositorFrames that have been submitted and have not |