DirectCompositorFrameSink Uses CompositorFrameSinkSupport

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>
@@ skipping 103 matching lines @@
 }
 
 void SurfaceManager::SatisfySequence(const SurfaceSequence& sequence) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(lifetime_type_, LifetimeType::SEQUENCES);
   satisfied_sequences_.insert(sequence);
   GarbageCollectSurfaces();
 }
 
 void SurfaceManager::RegisterFrameSinkId(const FrameSinkId& frame_sink_id) {
-  bool inserted = valid_frame_sink_ids_.insert(frame_sink_id).second;
-  DCHECK(inserted);
+  valid_frame_sink_ids_.insert(frame_sink_id);

[boliu, 2017/01/26 22:39:41]

why drop this DCHECK? is client inserting duplicates now, then that should be
fixed?

[Alex Z., 2017/01/27 20:27:02]

From fsamuel@'s comment:

ui::Compositor Registers the FrameSinkId first:
https://cs.chromium.org/chromium/src/ui/compositor/compositor.cc?sq=package:c...

However, we eventually want to get rid of that in favor of the SurfaceReference
approach to reference tracking. We're not there yet. For the time being, we are
registering the FrameSinkId in CompositorFrameSinkSupport. However, while we're
using SurfaceSequences, we cannot get rid of RegisterFrameSinkId in
ui::Compositor, so I thought getting rid of the DCHECK would be easier for now.

Note that once SurfaceReferences are used everywhere, RegisterFrameSinkId and
InvalidateFrameSinkId will likely go away.

 }
 
 void SurfaceManager::InvalidateFrameSinkId(const FrameSinkId& frame_sink_id) {
   valid_frame_sink_ids_.erase(frame_sink_id);
   GarbageCollectSurfaces();
 }
 
 const SurfaceId& SurfaceManager::GetRootSurfaceId() const {
   return root_surface_id_;
 }
@@ skipping 490 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