DirectCompositorFrameSink Uses CompositorFrameSinkSupport

cc/surfaces/compositor_frame_sink_support.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 #define CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 12 matching lines @@
 
 class CC_SURFACES_EXPORT CompositorFrameSinkSupport
     : public NON_EXPORTED_BASE(DisplayClient),
       public SurfaceFactoryClient,
       public BeginFrameObserver {
  public:
   CompositorFrameSinkSupport(
       CompositorFrameSinkSupportClient* client,
       SurfaceManager* surface_manager,
       const FrameSinkId& frame_sink_id,
-      std::unique_ptr<Display> display,
+      Display* display,
       std::unique_ptr<BeginFrameSource> display_begin_frame_source);
 
   ~CompositorFrameSinkSupport() override;
 
   const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
   void EvictFrame();
   void SetNeedsBeginFrame(bool needs_begin_frame);
   void SubmitCompositorFrame(const LocalFrameId& local_frame_id,
                              CompositorFrame frame);
   void Require(const LocalFrameId& local_frame_id,
                const SurfaceSequence& sequence);
   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();
+  void RegisterFrameSinkId();
+  void InvalidateFrameSinkId();
 
   Display* display() { return display_.get(); }
 
  private:
   void DidReceiveCompositorFrameAck();
 
   // DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const RenderPassList& render_passes) override;
@@ skipping 15 matching lines @@
   CompositorFrameSinkSupportClient* const client_;
 
   SurfaceManager* const surface_manager_;
 
   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_;

[Fady Samuel, 2017/01/04 21:53:05]

This should be a raw pointer!

[Alex Z., 2017/01/05 00:30:13]

Done.

 
   LocalFrameId local_frame_id_;
   SurfaceFactory surface_factory_;
   // Counts the number of CompositorFrames that have been submitted and have not
   // yet received an ACK.
   int ack_pending_count_ = 0;
   ReturnedResourceArray surface_returned_resources_;
 
   // The begin frame source being observered. Null if none.
   BeginFrameSource* begin_frame_source_ = nullptr;
@@ skipping 11 matching lines @@
   std::unordered_set<FrameSinkId, FrameSinkIdHash> child_frame_sinks_;
 
   base::WeakPtrFactory<CompositorFrameSinkSupport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkSupport);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_