Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/surface_manager.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_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
 #include <utility>
 
 #include "base/logging.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/direct_surface_reference_factory.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface.h"
-#include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_info.h"
 
 #if DCHECK_IS_ON()
 #include <sstream>
 #endif
 
 namespace cc {
 
 SurfaceManager::SurfaceManager(LifetimeType lifetime_type)
     : lifetime_type_(lifetime_type),
@@ skipping 40 matching lines @@
     std::unique_ptr<SurfaceDependencyTracker> dependency_tracker) {
   dependency_tracker_ = std::move(dependency_tracker);
 }
 
 void SurfaceManager::RequestSurfaceResolution(Surface* pending_surface) {
   if (dependency_tracker_)
     dependency_tracker_->RequestSurfaceResolution(pending_surface);
 }
 
 std::unique_ptr<Surface> SurfaceManager::CreateSurface(
-    base::WeakPtr<SurfaceFactory> surface_factory,
+    base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support,
     const LocalSurfaceId& local_surface_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(local_surface_id.is_valid() && surface_factory);
+  DCHECK(local_surface_id.is_valid() && compositor_frame_sink_support);
 
-  SurfaceId surface_id(surface_factory->frame_sink_id(), local_surface_id);
+  SurfaceId surface_id(compositor_frame_sink_support->frame_sink_id(),
+                       local_surface_id);
 
   // If no surface with this SurfaceId exists, simply create the surface and
   // return.
   auto surface_iter = surface_map_.find(surface_id);
   if (surface_iter == surface_map_.end()) {
-    auto surface = base::MakeUnique<Surface>(surface_id, surface_factory);
+    auto surface =
+        base::MakeUnique<Surface>(surface_id, compositor_frame_sink_support);
     surface_map_[surface->surface_id()] = surface.get();
     return surface;
   }
 
   // If a surface with this SurfaceId exists and it's not marked as destroyed,
   // we should not receive a request to create a new surface with the same
   // SurfaceId.
   DCHECK(surface_iter->second->destroyed());
 
   // If a surface with this SurfaceId exists and it's marked as destroyed,
   // it means it's in the garbage collector's queue. We simply take it out of
   // the queue and reuse it.
   auto it =
       std::find_if(surfaces_to_destroy_.begin(), surfaces_to_destroy_.end(),
                    [&surface_id](const std::unique_ptr<Surface>& surface) {
                      return surface->surface_id() == surface_id;
                    });
   DCHECK(it != surfaces_to_destroy_.end());
   std::unique_ptr<Surface> surface = std::move(*it);
   surfaces_to_destroy_.erase(it);
   surface->set_destroyed(false);
-  DCHECK_EQ(surface_factory.get(), surface->factory().get());
+  DCHECK_EQ(compositor_frame_sink_support.get(),
+            surface->compositor_frame_sink_support().get());
   return surface;
 }
 
 void SurfaceManager::DestroySurface(std::unique_ptr<Surface> surface) {
   DCHECK(thread_checker_.CalledOnValidThread());
   surface->set_destroyed(true);
   surfaces_to_destroy_.push_back(std::move(surface));
   GarbageCollectSurfaces();
 }
 
@@ skipping 271 matching lines @@
   for (auto iter = begin_iter; iter != end_iter; ++iter)
     temporary_references_.erase(SurfaceId(frame_sink_id, *iter));
   frame_sink_temp_refs.erase(begin_iter, end_iter);
 
   // If last temporary reference is removed for |frame_sink_id| then cleanup
   // range tracking map entry.
   if (frame_sink_temp_refs.empty())
     temporary_reference_ranges_.erase(frame_sink_id);
 }
 
-void SurfaceManager::RegisterSurfaceFactoryClient(
+void SurfaceManager::RegisterCompositorFrameSinkSupport(
     const FrameSinkId& frame_sink_id,
-    SurfaceFactoryClient* client) {
-  framesink_manager_.RegisterSurfaceFactoryClient(frame_sink_id, client);
+    CompositorFrameSinkSupport* support) {
+  framesink_manager_.RegisterCompositorFrameSinkSupport(frame_sink_id, support);
 }
 
-void SurfaceManager::UnregisterSurfaceFactoryClient(
+void SurfaceManager::UnregisterCompositorFrameSinkSupport(
     const FrameSinkId& frame_sink_id) {
-  framesink_manager_.UnregisterSurfaceFactoryClient(frame_sink_id);
+  framesink_manager_.UnregisterCompositorFrameSinkSupport(frame_sink_id);
 }
 
 void SurfaceManager::RegisterBeginFrameSource(
     BeginFrameSource* source,
     const FrameSinkId& frame_sink_id) {
   framesink_manager_.RegisterBeginFrameSource(source, frame_sink_id);
 }
 
 void SurfaceManager::UnregisterBeginFrameSource(BeginFrameSource* source) {
   framesink_manager_.UnregisterBeginFrameSource(source);
@@ skipping 29 matching lines @@
   return changed;
 }
 
 void SurfaceManager::SurfaceCreated(const SurfaceInfo& surface_info) {
   CHECK(thread_checker_.CalledOnValidThread());
 
   if (lifetime_type_ == LifetimeType::REFERENCES) {
     // We can get into a situation where multiple CompositorFrames arrive for
     // a CompositorFrameSink before the client can add any references for the
     // frame. When the second frame with a new size arrives, the first will be
-    // destroyed in SurfaceFactory and then if there are no references it will
-    // be deleted during surface GC. A temporary reference, removed when a
-    // real reference is received, is added to prevent this from happening.
+    // destroyed in CompositorFrameSinkSupport and then if there are no
+    // references it will be deleted during surface GC. A temporary reference,
+    // removed when a real reference is received, is added to prevent this from
+    // happening.
     auto it = child_to_parent_refs_.find(surface_info.id());
     // TODO(fsamuel): Tests create empty sets and so we also need to check that
     // they're not empty here. Ideally tests shouldn't do that and we shouldn't
     // use array notation into maps in tests (see https://crbug.com/691115).
     bool has_real_reference =
         it != child_to_parent_refs_.end() && !it->second.empty();
     if (!has_real_reference)
       AddTemporaryReference(surface_info.id());
   }
 
@@ skipping 50 matching lines @@
     std::vector<SurfaceId> children(iter->second.begin(), iter->second.end());
     std::sort(children.begin(), children.end());
 
     for (const SurfaceId& child_id : children)
       SurfaceReferencesToStringImpl(child_id, indent + "  ", str);
   }
 }
 #endif  // DCHECK_IS_ON()
 
 }  // namespace cc