Adding SatisfySequence and RequireSequence to SurfaceManager

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 59 matching lines @@
   parent_to_child_refs_.erase(surface_id);
 }
 
 void SurfaceManager::Destroy(std::unique_ptr<Surface> surface) {
   DCHECK(thread_checker_.CalledOnValidThread());
   surface->set_destroyed(true);
   surfaces_to_destroy_.push_back(std::move(surface));
   GarbageCollectSurfaces();
 }
 
-void SurfaceManager::DidSatisfySequences(const FrameSinkId& frame_sink_id,
-                                         std::vector<uint32_t>* sequence) {
+void SurfaceManager::RequireSequence(const SurfaceId& surface_id,
+                                     const SurfaceSequence& sequence) {
+  auto* surface = GetSurfaceForId(surface_id);
+  if (!surface) {
+    LOG(ERROR) << "Attempting to require callback on nonexistent surface";

[danakj, 2017/01/09 19:07:43]

We don't usually put LOGs in code that we ship, I'm not sure how this got there.
This should be DLOG probably.

+    return;
+  }
+  surface->AddDestructionDependency(sequence);
+}
+
+void SurfaceManager::SatisfySequence(const SurfaceSequence& sequence) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(lifetime_type_, LifetimeType::SEQUENCES);
-  for (uint32_t value : *sequence)
-    satisfied_sequences_.insert(SurfaceSequence(frame_sink_id, value));
-  sequence->clear();
+  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);
 }
 
 void SurfaceManager::InvalidateFrameSinkId(const FrameSinkId& frame_sink_id) {
   valid_frame_sink_ids_.erase(frame_sink_id);
@@ skipping 398 matching lines @@
   return changed;
 }
 
 void SurfaceManager::SurfaceCreated(const SurfaceInfo& surface_info) {
   CHECK(thread_checker_.CalledOnValidThread());
   for (auto& observer : observer_list_)
     observer.OnSurfaceCreated(surface_info);
 }
 
 }  // namespace cc