Move FrameSink hierarchy registration to DisplayCompositor interface

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 <vector>
 
@@ skipping 32 matching lines @@
   // 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());
 
-  for (auto& child_frame_sink_id : child_frame_sinks_) {
-    DCHECK(child_frame_sink_id.is_valid());
-    surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                   child_frame_sink_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_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSinkSupport::EvictFrame() {
@@ skipping 77 matching lines @@
 
   if (!client_)
     return;
   client_->DidReceiveCompositorFrameAck();
   if (!surface_returned_resources_.empty()) {
     client_->ReclaimResources(surface_returned_resources_);
     surface_returned_resources_.clear();
   }
 }
 
-void CompositorFrameSinkSupport::AddChildFrameSink(
-    const FrameSinkId& child_frame_sink_id) {
-  child_frame_sinks_.insert(child_frame_sink_id);
-  surface_manager_->RegisterFrameSinkHierarchy(frame_sink_id_,
-                                               child_frame_sink_id);
-}
-
-void CompositorFrameSinkSupport::RemoveChildFrameSink(
-    const FrameSinkId& child_frame_sink_id) {
-  auto it = child_frame_sinks_.find(child_frame_sink_id);
-  DCHECK(it != child_frame_sinks_.end());
-  DCHECK(it->is_valid());
-  surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                 child_frame_sink_id);
-  child_frame_sinks_.erase(it);
-}
-
 void CompositorFrameSinkSupport::ForceReclaimResources() {
   surface_factory_.ClearSurface();
 }
 
 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;
@@ skipping 68 matching lines @@
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 void CompositorFrameSinkSupport::RequestCopyOfSurface(
     std::unique_ptr<CopyOutputRequest> request) {
   surface_factory_.RequestCopyOfSurface(std::move(request));
 }
 
 }  // namespace cc