Adding SatisfySequence and RequireSequence to SurfaceManager

cc/surfaces/surface_factory_unittest.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_factory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 508 matching lines @@
 
   manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
 
   // Check that waiting before the sequence is satisfied works.
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kArbitraryFrameSinkId, 4));
   factory2->EvictSurface();
 
   CompositorFrame frame;
   DCHECK(manager_.GetSurfaceForId(id2));
-  std::vector<uint32_t> sequences = {4, 6};
-  manager_.DidSatisfySequences(kArbitraryFrameSinkId, &sequences);
+  manager_.SatisfySequence(SurfaceSequence(kArbitraryFrameSinkId, 4));
+  manager_.SatisfySequence(SurfaceSequence(kArbitraryFrameSinkId, 6));
   DCHECK(!manager_.GetSurfaceForId(id2));
 
   // Check that waiting after the sequence is satisfied works.
   factory2->SubmitCompositorFrame(local_frame_id2, CompositorFrame(),
                                   SurfaceFactory::DrawCallback());
   DCHECK(manager_.GetSurfaceForId(id2));
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kAnotherArbitraryFrameSinkId, 6));
   factory2->EvictSurface();
   DCHECK(!manager_.GetSurfaceForId(id2));
@@ skipping 54 matching lines @@
     factory_->SubmitCompositorFrame(local_frame_id_, std::move(frame),
                                     SurfaceFactory::DrawCallback());
   }
   factory_->EvictSurface();
   EXPECT_TRUE(manager_.GetSurfaceForId(id2));
   // local_frame_id_ should be retained by reference from id2.
   EXPECT_TRUE(manager_.GetSurfaceForId(
       SurfaceId(factory_->frame_sink_id(), local_frame_id_)));
 
   // Satisfy last destruction dependency for id2.
-  std::vector<uint32_t> to_satisfy;
-  to_satisfy.push_back(4);
-  manager_.DidSatisfySequences(kAnotherArbitraryFrameSinkId, &to_satisfy);
+  manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
 
   // id2 and local_frame_id_ are in a reference cycle that has no surface
   // sequences holding on to it, so they should be destroyed.
   EXPECT_TRUE(!manager_.GetSurfaceForId(id2));
   EXPECT_TRUE(!manager_.GetSurfaceForId(
       SurfaceId(factory_->frame_sink_id(), local_frame_id_)));
 
   local_frame_id_ = LocalFrameId();
 }
 
@@ skipping 48 matching lines @@
 
   factory_->EvictSurface();
   local_frame_id_ = LocalFrameId();
   EXPECT_TRUE(called1);
   EXPECT_TRUE(called2);
   EXPECT_TRUE(called3);
 }
 
 }  // namespace
 }  // namespace cc