Move Work From CompositorFrameSinkSupport() To Init()

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 11 matching lines @@
 namespace cc {
 
 class CompositorFrameSinkSupportClient;
 class SurfaceManager;
 
 class CC_SURFACES_EXPORT CompositorFrameSinkSupport
     : public SurfaceFactoryClient,
       public BeginFrameObserver {
  public:
   CompositorFrameSinkSupport(CompositorFrameSinkSupportClient* client,
-                             SurfaceManager* surface_manager,
                              const FrameSinkId& frame_sink_id,
                              bool is_root,
-                             bool handles_frame_sink_id_invalidation,
-                             bool needs_sync_points);
+                             bool handles_frame_sink_id_invalidation);
 
   ~CompositorFrameSinkSupport() override;
 
+  void Init(SurfaceManager* surface_manager, bool needs_sync_points);
+
   const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
   Surface* current_surface_for_testing() {
-    return surface_factory_.current_surface_for_testing();
+    return surface_factory_->current_surface_for_testing();
   }
 
   const ReferencedSurfaceTracker& ReferenceTrackerForTesting() const {
     return reference_tracker_;
   }
 
   // SurfaceFactoryClient implementation.
   void ReferencedSurfacesChanged(
       const LocalSurfaceId& local_surface_id,
       const std::vector<SurfaceId>* active_referenced_surfaces,
@@ skipping 27 matching lines @@
 
   // BeginFrameObserver implementation.
   void OnBeginFrame(const BeginFrameArgs& args) override;
   const BeginFrameArgs& LastUsedBeginFrameArgs() const override;
   void OnBeginFrameSourcePausedChanged(bool paused) override;
 
   void UpdateNeedsBeginFramesInternal();
 
   CompositorFrameSinkSupportClient* const client_;
 
-  SurfaceManager* const surface_manager_;
+  SurfaceManager* surface_manager_;
 
   const FrameSinkId frame_sink_id_;
 
-  SurfaceFactory surface_factory_;
+  std::unique_ptr<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;
 
   // The last begin frame args generated by the begin frame source.
   BeginFrameArgs last_begin_frame_args_;
@@ skipping 23 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_