Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/framesink_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/framesink_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
-#include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 
 #if DCHECK_IS_ON()
 #include <sstream>
 #endif
 
 namespace cc {
 
 FrameSinkManager::FrameSinkSourceMapping::FrameSinkSourceMapping()
     : source(nullptr) {}
 
 FrameSinkManager::FrameSinkSourceMapping::FrameSinkSourceMapping(
     const FrameSinkSourceMapping& other) = default;
 
 FrameSinkManager::FrameSinkSourceMapping::~FrameSinkSourceMapping() {
 }
 
 FrameSinkManager::FrameSinkManager() {}
 
 FrameSinkManager::~FrameSinkManager() {
-  // All surface factory clients should be unregistered prior to SurfaceManager
-  // destruction.
+  // All compositor frame supports should be unregistered prior to

[Fady Samuel, 2017/04/06 21:53:23]

All CompositorFrameSinks should be unregistered...

[Alex Z., 2017/04/13 17:15:30]

Done.

+  // SurfaceManager destruction.
   DCHECK_EQ(clients_.size(), 0u);
   DCHECK_EQ(registered_sources_.size(), 0u);
 }
 
 void FrameSinkManager::RegisterFrameSinkId(const FrameSinkId& frame_sink_id) {
   bool inserted = valid_frame_sink_ids_.insert(frame_sink_id).second;
   DCHECK(inserted);
 }
 
 void FrameSinkManager::InvalidateFrameSinkId(const FrameSinkId& frame_sink_id) {
   valid_frame_sink_ids_.erase(frame_sink_id);
 }
 
-void FrameSinkManager::RegisterSurfaceFactoryClient(
+void FrameSinkManager::RegisterCompositorFrameSinkSupport(

[Fady Samuel, 2017/04/06 21:53:23]

How about just RegisterCompositorFrameSink?

[Alex Z., 2017/04/13 17:15:30]

Done.

     const FrameSinkId& frame_sink_id,
-    SurfaceFactoryClient* client) {
-  DCHECK(client);
+    CompositorFrameSinkSupport* support) {
+  DCHECK(support);
   DCHECK_EQ(valid_frame_sink_ids_.count(frame_sink_id), 1u);
 
-  clients_[frame_sink_id] = client;
+  clients_[frame_sink_id] = support;
 
   auto it = frame_sink_source_map_.find(frame_sink_id);
   if (it != frame_sink_source_map_.end()) {
     if (it->second.source)
-      client->SetBeginFrameSource(it->second.source);
+      support->SetBeginFrameSource(it->second.source);
   }
 }
 
-void FrameSinkManager::UnregisterSurfaceFactoryClient(
+void FrameSinkManager::UnregisterCompositorFrameSinkSupport(

[Fady Samuel, 2017/04/06 21:53:23]

How about just UnregisterCompositorFrameSink?

[Alex Z., 2017/04/13 17:15:30]

Done.

     const FrameSinkId& frame_sink_id) {
   DCHECK_EQ(valid_frame_sink_ids_.count(frame_sink_id), 1u);
   auto client_iter = clients_.find(frame_sink_id);
   DCHECK(client_iter != clients_.end());
 
   auto source_iter = frame_sink_source_map_.find(frame_sink_id);
   if (source_iter != frame_sink_source_map_.end()) {
     if (source_iter->second.source)
       client_iter->second->SetBeginFrameSource(nullptr);
     if (!source_iter->second.has_children())
@@ skipping 128 matching lines @@
   for (size_t i = 0; i < children.size(); ++i) {
     if (children[i] == child_frame_sink_id) {
       found_child = true;
       children[i] = children.back();
       children.resize(children.size() - 1);
       break;
     }
   }
   DCHECK(found_child);
 
-  // The SurfaceFactoryClient and hierarchy can be registered/unregistered
+  // The CompositorFrameSinkSupport and hierarchy can be registered/unregistered
   // in either order, so empty frame_sink_source_map entries need to be
   // checked when removing either clients or relationships.
   if (!iter->second.has_children() && !clients_.count(parent_frame_sink_id) &&
       !iter->second.source) {
     frame_sink_source_map_.erase(iter);
     return;
   }
 
   // If the parent does not have a begin frame source, then disconnecting it
   // will not change any of its children.
   BeginFrameSource* parent_source = iter->second.source;
   if (!parent_source)
     return;
 
   // TODO(enne): these walks could be done in one step.
   RecursivelyDetachBeginFrameSource(child_frame_sink_id, parent_source);
   for (auto source_iter : registered_sources_)
     RecursivelyAttachBeginFrameSource(source_iter.second, source_iter.first);
 }
 
 }  // namespace cc