Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/surface.cc

 // Copyright 2014 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/surface.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/pending_frame_observer.h"
-#include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
 
 // The frame index starts at 2 so that empty frames will be treated as
 // completely damaged the first time they're drawn from.
 static const int kFrameIndexStart = 2;
 
-Surface::Surface(const SurfaceId& id, base::WeakPtr<SurfaceFactory> factory)
+Surface::Surface(
+    const SurfaceId& id,
+    base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support)
     : surface_id_(id),
       previous_frame_surface_id_(id),
-      factory_(factory),
+      compositor_frame_sink_support_(compositor_frame_sink_support),
       frame_index_(kFrameIndexStart),
       destroyed_(false) {}
 
 Surface::~Surface() {
   ClearCopyRequests();
-  if (factory_) {
+  if (compositor_frame_sink_support_) {
     if (pending_frame_)
       UnrefFrameResources(*pending_frame_);
     if (active_frame_)
       UnrefFrameResources(*active_frame_);
   }
   if (!draw_callback_.is_null())
     draw_callback_.Run();
 
   for (auto& observer : observers_)
     observer.OnSurfaceDiscarded(this);
@@ skipping 13 matching lines @@
   TakeLatencyInfoFromPendingFrame(&frame.metadata.latency_info);
 
   base::Optional<CompositorFrame> previous_pending_frame =
       std::move(pending_frame_);
   pending_frame_.reset();
 
   UpdateBlockingSurfaces(previous_pending_frame, frame);
 
   // Receive and track the resources referenced from the CompositorFrame
   // regardless of whether it's pending or active.
-  factory_->ReceiveFromChild(frame.resource_list);
+  compositor_frame_sink_support_->ReceiveFromChild(frame.resource_list);
 
   if (!blocking_surfaces_.empty()) {
     pending_frame_ = std::move(frame);
     // Ask the surface manager to inform |this| when its dependencies are
     // resolved.
-    factory_->manager()->RequestSurfaceResolution(this);
+    compositor_frame_sink_support_->surface_manager()->RequestSurfaceResolution(
+        this);
 
     // We do not have to notify observers that referenced surfaces have changed
     // in the else case because ActivateFrame will notify observers.
     for (auto& observer : observers_) {
       observer.OnReferencedSurfacesChanged(this, active_referenced_surfaces(),
                                            pending_referenced_surfaces());
     }
   } else {
     // If there are no blockers, then immediately activate the frame.
     ActivateFrame(std::move(frame));
@@ skipping 73 matching lines @@
 void Surface::ActivatePendingFrame() {
   DCHECK(pending_frame_);
   ActivateFrame(std::move(pending_frame_.value()));
   pending_frame_.reset();
 }
 
 // A frame is activated if all its Surface ID dependences are active or a
 // deadline has hit and the frame was forcibly activated by the display
 // compositor.
 void Surface::ActivateFrame(CompositorFrame frame) {
-  DCHECK(factory_);
+  DCHECK(compositor_frame_sink_support_);
 
   // Save root pass copy requests.
   std::vector<std::unique_ptr<CopyOutputRequest>> old_copy_requests;
   if (active_frame_ && !active_frame_->render_pass_list.empty()) {
     std::swap(old_copy_requests,
               active_frame_->render_pass_list.back()->copy_requests);
   }
 
   ClearCopyRequests();
 
@@ skipping 22 matching lines @@
     observer.OnReferencedSurfacesChanged(this, active_referenced_surfaces(),
                                          pending_referenced_surfaces());
   }
 }
 
 void Surface::UpdateBlockingSurfaces(
     const base::Optional<CompositorFrame>& previous_pending_frame,
     const CompositorFrame& current_frame) {
   // If there is no SurfaceDependencyTracker installed then the |current_frame|
   // does not block on anything.
-  if (!factory_->manager()->dependency_tracker()) {
+  if (!compositor_frame_sink_support_->surface_manager()
+           ->dependency_tracker()) {
     blocking_surfaces_.clear();
     return;
   }
 
   base::flat_set<SurfaceId> new_blocking_surfaces;
 
   for (const SurfaceId& surface_id :
        current_frame.metadata.referenced_surfaces) {
-    Surface* surface = factory_->manager()->GetSurfaceForId(surface_id);
+    Surface* surface =
+        compositor_frame_sink_support_->surface_manager()->GetSurfaceForId(
+            surface_id);
     // If a referenced surface does not have a corresponding active frame in the
     // display compositor, then it blocks this frame.
     if (!surface || !surface->HasActiveFrame())
       new_blocking_surfaces.insert(surface_id);
   }
 
   // If this Surface has a previous pending frame, then we must determine the
   // changes in dependencies so that we can update the SurfaceDependencyTracker
   // map.
   if (previous_pending_frame.has_value()) {
@@ skipping 73 matching lines @@
                           !valid_frame_sink_ids->count(seq.frame_sink_id));
                 });
 }
 
 void Surface::UnrefFrameResources(const CompositorFrame& frame) {
   ReturnedResourceArray resources;
   TransferableResource::ReturnResources(frame.resource_list, &resources);
   // No point in returning same sync token to sender.
   for (auto& resource : resources)
     resource.sync_token.Clear();
-  factory_->UnrefResources(resources);
+  compositor_frame_sink_support_->UnrefResources(resources);
 }
 
 void Surface::ClearCopyRequests() {
   if (active_frame_) {
     for (const auto& render_pass : active_frame_->render_pass_list) {
       for (const auto& copy_request : render_pass->copy_requests)
         copy_request->SendEmptyResult();
     }
   }
 }
@@ skipping 13 matching lines @@
     frame->metadata.latency_info.swap(*latency_info);
     return;
   }
   std::copy(frame->metadata.latency_info.begin(),
             frame->metadata.latency_info.end(),
             std::back_inserter(*latency_info));
   frame->metadata.latency_info.clear();
 }
 
 }  // namespace cc