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 8471bbd15c6b186b1c4678f6f64a7246ab41fd18..f44a6016549d2a947442400e1a5461f7b06b6978 100644 |
--- a/cc/surfaces/compositor_frame_sink_support.h |
+++ b/cc/surfaces/compositor_frame_sink_support.h |
@@ -26,12 +26,11 @@ 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, |
danakj
2017/01/31 19:25:01
Comment: When can |display| be null?
Alex Z.
2017/01/31 20:34:18
Done.
|
+ SurfaceManager* surface_manager, |
+ const FrameSinkId& frame_sink_id, |
+ Display* display, |
+ bool needs_sync_points = true); |
~CompositorFrameSinkSupport() override; |
@@ -46,8 +45,9 @@ 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 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_; |
danakj
2017/01/31 19:25:01
this is a const variable right, make it so?
i'm n
Alex Z.
2017/01/31 20:34:18
Done.
|
SurfaceFactory surface_factory_; |
// Counts the number of CompositorFrames that have been submitted and have not |