Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/frame_sink_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/frame_sink_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "cc/surfaces/frame_sink_manager_client.h"
-#include "cc/surfaces/surface_factory_client.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 CompositorFrameSinks should be unregistered prior to
+  // 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) {
@@ skipping 77 matching lines @@
 
 void FrameSinkManager::RecursivelyDetachBeginFrameSource(
     const FrameSinkId& frame_sink_id,
     BeginFrameSource* source) {
   auto iter = frame_sink_source_map_.find(frame_sink_id);
   if (iter == frame_sink_source_map_.end())
     return;
   if (iter->second.source == source) {
     iter->second.source = nullptr;
     auto client_iter = clients_.find(frame_sink_id);
-    if (client_iter != clients_.end())
+    if (client_iter != clients_.end()) {

[danakj, 2017/05/03 16:08:39]

unrelated diff

[Alex Z., 2017/05/03 18:07:37]

Done.

       client_iter->second->SetBeginFrameSource(nullptr);
+    }
   }
 
   if (!iter->second.has_children() && !clients_.count(frame_sink_id)) {
     frame_sink_source_map_.erase(iter);
     return;
   }
 
   std::vector<FrameSinkId>& children = iter->second.children;
   for (size_t i = 0; i < children.size(); ++i) {
     RecursivelyDetachBeginFrameSource(children[i], source);
@@ skipping 58 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