cc: Unregister FrameSink hierarchy on CompositorFrameSinkSupport destruction

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 "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display.h"
@@ skipping 15 matching lines @@
   surface_manager_->RegisterFrameSinkId(frame_sink_id_);
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
 
   if (display_) {
     display_->Initialize(this, surface_manager_);
     display_->SetVisible(true);
   }
 }
 
 CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
+  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_);
   surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSinkSupport::EvictFrame() {
   surface_factory_.EvictSurface();
@@ skipping 40 matching lines @@
     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::DisplayOutputSurfaceLost() {}
 
 void CompositorFrameSinkSupport::DisplayWillDrawAndSwap(
     bool will_draw_and_swap,
     const RenderPassList& render_passes) {}
 
 void CompositorFrameSinkSupport::DisplayDidDrawAndSwap() {}
 
@@ skipping 50 matching lines @@
     return;
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace cc