Move Work From CompositorFrameSinkSupport() To Init()

cc/surfaces/compositor_frame_sink_support.cc

 // 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.
 
 #include "cc/surfaces/compositor_frame_sink_support.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_reference.h"
 
 namespace cc {
 
 CompositorFrameSinkSupport::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)
     : client_(client),
-      surface_manager_(surface_manager),

[boliu, 2017/04/11 20:49:13]

this still needs to be initialized to null, though you are free to do that in
the header instead

[Alex Z., 2017/04/11 20:57:17]

Done.

       frame_sink_id_(frame_sink_id),
-      surface_factory_(frame_sink_id_, surface_manager_, this),
       reference_tracker_(frame_sink_id),
       is_root_(is_root),
       handles_frame_sink_id_invalidation_(handles_frame_sink_id_invalidation),
-      weak_factory_(this) {
-  surface_factory_.set_needs_sync_points(needs_sync_points);
-  if (handles_frame_sink_id_invalidation_)
-    surface_manager_->RegisterFrameSinkId(frame_sink_id_);
-  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-}
+      weak_factory_(this) {}
 
 CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
   // Unregister |this| as a BeginFrameObserver so that the BeginFrameSource does
   // not call into |this| after it's deleted.
   SetNeedsBeginFrame(false);
 
   // For display root surfaces, the surface is no longer going to be visible
   // so make it unreachable from the top-level root.
   if (surface_manager_->using_surface_references() && is_root_ &&
       reference_tracker_.current_surface_id().is_valid())
     RemoveTopLevelRootReference(reference_tracker_.current_surface_id());
 
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
-  surface_factory_.EvictSurface();
+  surface_factory_->EvictSurface();
   surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
+void CompositorFrameSinkSupport::Init(SurfaceManager* surface_manager,
+                                      bool needs_sync_points) {
+  surface_manager_ = surface_manager;
+  surface_factory_ =
+      base::MakeUnique<SurfaceFactory>(frame_sink_id_, surface_manager_, this);
+  if (handles_frame_sink_id_invalidation_)
+    surface_manager_->RegisterFrameSinkId(frame_sink_id_);
+  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
+  surface_factory_->set_needs_sync_points(needs_sync_points);
+}
+
 void CompositorFrameSinkSupport::ReferencedSurfacesChanged(
     const LocalSurfaceId& local_surface_id,
     const std::vector<SurfaceId>* active_referenced_surfaces,
     const std::vector<SurfaceId>* pending_referenced_surfaces) {
   if (!surface_manager_->using_surface_references())
     return;
 
   SurfaceId last_surface_id = reference_tracker_.current_surface_id();
 
   // Populate list of surface references to add and remove based on reference
@@ skipping 32 matching lines @@
 }
 
 void CompositorFrameSinkSupport::WillDrawSurface(
     const LocalSurfaceId& local_surface_id,
     const gfx::Rect& damage_rect) {
   if (client_)
     client_->WillDrawSurface(local_surface_id, damage_rect);
 }
 
 void CompositorFrameSinkSupport::EvictFrame() {
-  surface_factory_.EvictSurface();
+  DCHECK(surface_factory_);
+  surface_factory_->EvictSurface();
 }
 
 void CompositorFrameSinkSupport::SetNeedsBeginFrame(bool needs_begin_frame) {
   needs_begin_frame_ = needs_begin_frame;
   UpdateNeedsBeginFramesInternal();
 }
 
 void CompositorFrameSinkSupport::BeginFrameDidNotSwap(
     const BeginFrameAck& ack) {
   // TODO(eseckler): While a pending CompositorFrame exists (see TODO below), we
   // should not acknowledge immediately. Instead, we should update the ack that
   // will be sent to DisplayScheduler when the pending frame is activated.
   if (ack.sequence_number < BeginFrameArgs::kStartingFrameNumber) {
     DLOG(ERROR) << "Received BeginFrameDidNotSwap with invalid BeginFrameAck.";
     return;
   }
 
   // |has_damage| is not transmitted, but false by default.
   DCHECK(!ack.has_damage);
   if (begin_frame_source_)
     begin_frame_source_->DidFinishFrame(this, ack);
 }
 
 void CompositorFrameSinkSupport::SubmitCompositorFrame(
     const LocalSurfaceId& local_surface_id,
     CompositorFrame frame) {
+  DCHECK(surface_factory_);
   ++ack_pending_count_;
 
   if (frame.metadata.begin_frame_ack.sequence_number <
       BeginFrameArgs::kStartingFrameNumber) {
     DLOG(ERROR) << "Received CompositorFrame with invalid BeginFrameAck.";
     frame.metadata.begin_frame_ack.source_id = BeginFrameArgs::kManualSourceId;
     frame.metadata.begin_frame_ack.sequence_number =
         BeginFrameArgs::kStartingFrameNumber;
   }
   // |has_damage| is not transmitted.
   frame.metadata.begin_frame_ack.has_damage = true;
 
   BeginFrameAck ack = frame.metadata.begin_frame_ack;
-  surface_factory_.SubmitCompositorFrame(
+  surface_factory_->SubmitCompositorFrame(
       local_surface_id, std::move(frame),
       base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
                  weak_factory_.GetWeakPtr()));
 
   // TODO(eseckler): The CompositorFrame submitted below might not be activated
   // right away b/c of surface synchronization. We should only send the
   // BeginFrameAck to DisplayScheduler when it is activated. This also means
   // that we need to stay an active BFO while a CompositorFrame is pending.
   // See https://crbug.com/703079.
   if (begin_frame_source_)
@@ skipping 55 matching lines @@
   // We return the resources before sending an ack so they can be reused in
   // making the next CompositorFrame.
   if (!surface_returned_resources_.empty()) {
     client_->ReclaimResources(surface_returned_resources_);
     surface_returned_resources_.clear();
   }
   client_->DidReceiveCompositorFrameAck();
 }
 
 void CompositorFrameSinkSupport::ForceReclaimResources() {
-  surface_factory_.ClearSurface();
+  DCHECK(surface_factory_);
+  surface_factory_->ClearSurface();
 }
 
 void CompositorFrameSinkSupport::ClaimTemporaryReference(
     const SurfaceId& surface_id) {
   surface_manager_->AssignTemporaryReference(surface_id, frame_sink_id_);
 }
 
 void CompositorFrameSinkSupport::OnBeginFrame(const BeginFrameArgs& args) {
   UpdateNeedsBeginFramesInternal();
   last_begin_frame_args_ = args;
@@ skipping 17 matching lines @@
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 void CompositorFrameSinkSupport::RequestCopyOfSurface(
     std::unique_ptr<CopyOutputRequest> request) {
-  surface_factory_.RequestCopyOfSurface(std::move(request));
+  DCHECK(surface_factory_);
+  surface_factory_->RequestCopyOfSurface(std::move(request));
 }
 
 }  // namespace cc