cc: Move ownership of surfaces to SurfaceManager

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 <memory>
 #include <unordered_set>
 #include <vector>
@@ skipping 25 matching lines @@
       SurfaceManager* surface_manager,
       const FrameSinkId& frame_sink_id,
       bool is_root,
       bool handles_frame_sink_id_invalidation,
       bool needs_sync_points);
 
   ~CompositorFrameSinkSupport() override;
 
   const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
-  Surface* current_surface_for_testing() { return current_surface_.get(); }
   SurfaceManager* surface_manager() { return surface_manager_; }
   bool needs_sync_points() { return needs_sync_points_; }
 
   // SurfaceResourceHolderClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override;
 
   // FrameSinkManagerClient implementation.
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
 
   void EvictCurrentSurface();
   void SetNeedsBeginFrame(bool needs_begin_frame);
   void DidNotProduceFrame(const BeginFrameAck& ack);
   bool SubmitCompositorFrame(const LocalSurfaceId& local_surface_id,
                              CompositorFrame frame);
   void RequestCopyOfSurface(std::unique_ptr<CopyOutputRequest> request);
   void ClaimTemporaryReference(const SurfaceId& surface_id);
 
   // TODO(staraz): Move the following 3 methods to private.
   void ReceiveFromChild(const TransferableResourceArray& resources);
   void RefResources(const TransferableResourceArray& resources);
   void UnrefResources(const ReturnedResourceArray& resources);
 
   void OnSurfaceActivated(Surface* surface);
 
+  Surface* GetCurrentSurface();

[Fady Samuel, 2017/06/20 17:29:07]

Does this need to be public?

[Saman Sami, 2017/06/20 22:47:10]

It's used in some tests.

+  SurfaceId GetCurrentSurfaceId();

[Fady Samuel, 2017/06/20 17:29:06]

Does this need to be public?

[Saman Sami, 2017/06/20 22:47:10]

I just removed it per your suggestion.

+
  protected:
   CompositorFrameSinkSupport(CompositorFrameSinkSupportClient* client,
                              const FrameSinkId& frame_sink_id,
                              bool is_root,
                              bool handles_frame_sink_id_invalidation,
                              bool needs_sync_points);
 
   void Init(SurfaceManager* surface_manager);
 
  private:
@@ skipping 11 matching lines @@
   void DidReceiveCompositorFrameAck();
   void WillDrawSurface(const LocalSurfaceId& local_surface_id,
                        const gfx::Rect& damage_rect);
 
   // BeginFrameObserver implementation.
   void OnBeginFrame(const BeginFrameArgs& args) override;
   const BeginFrameArgs& LastUsedBeginFrameArgs() const override;
   void OnBeginFrameSourcePausedChanged(bool paused) override;
 
   void UpdateNeedsBeginFramesInternal();
-  std::unique_ptr<Surface> CreateSurface(const SurfaceInfo& surface_info);
-  void DestroyCurrentSurface();
+  Surface* CreateSurface(const SurfaceInfo& surface_info);
 
   CompositorFrameSinkSupportClient* const client_;
 
   SurfaceManager* surface_manager_ = nullptr;
 
   const FrameSinkId frame_sink_id_;
+  LocalSurfaceId current_local_surface_id_;
 
   // If this contains a value then a surface reference from the top-level root
   // to SurfaceId(frame_sink_id_, referenced_local_surface_id_.value()) was
   // added. This will not contain a value if |is_root_| is false.
   base::Optional<LocalSurfaceId> referenced_local_surface_id_;
 
   SurfaceResourceHolder surface_resource_holder_;
 
-  std::unique_ptr<Surface> current_surface_;
   // 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;
 
   // The last begin frame args generated by the begin frame source.
   BeginFrameArgs last_begin_frame_args_;
@@ skipping 21 matching lines @@
   const bool handles_frame_sink_id_invalidation_;
 
   base::WeakPtrFactory<CompositorFrameSinkSupport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkSupport);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_