| Index: cc/surfaces/surface_factory_unittest.cc
|
| diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
|
| index 2ae43000dad0e777afb54e61fcbc35318353a2b1..0e445dd8cafc7b50a812df6433d5e5d1c63f221c 100644
|
| --- a/cc/surfaces/surface_factory_unittest.cc
|
| +++ b/cc/surfaces/surface_factory_unittest.cc
|
| @@ -584,86 +584,6 @@ TEST_F(SurfaceFactoryTest, EvictSurfaceDependencyRegistered) {
|
| EXPECT_FALSE(client_.returned_resources().empty());
|
| }
|
|
|
| -// Tests that SurfaceFactory returns resources after Reset().
|
| -TEST_F(SurfaceFactoryTest, Reset) {
|
| - LocalSurfaceId id(7, kArbitraryToken);
|
| -
|
| - TransferableResource resource;
|
| - resource.id = 1;
|
| - resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
|
| - CompositorFrame frame;
|
| - frame.resource_list.push_back(resource);
|
| - factory_->SubmitCompositorFrame(id, std::move(frame),
|
| - SurfaceFactory::DrawCallback());
|
| - EXPECT_EQ(last_created_surface_id().local_surface_id(), id);
|
| -
|
| - SurfaceId surface_id(kArbitraryFrameSinkId, id);
|
| - EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_TRUE(client_.returned_resources().empty());
|
| - factory_->Reset();
|
| - EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_FALSE(client_.returned_resources().empty());
|
| - local_surface_id_ = LocalSurfaceId();
|
| -}
|
| -
|
| -// Tests that SurfaceFactory returns resources after Reset() if dependency
|
| -// unregistered.
|
| -TEST_F(SurfaceFactoryTest, ResetDependenceUnRegistered) {
|
| - LocalSurfaceId id(7, kArbitraryToken);
|
| -
|
| - TransferableResource resource;
|
| - resource.id = 1;
|
| - resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
|
| - CompositorFrame frame;
|
| - frame.resource_list.push_back(resource);
|
| - factory_->SubmitCompositorFrame(id, std::move(frame),
|
| - SurfaceFactory::DrawCallback());
|
| - EXPECT_EQ(last_created_surface_id().local_surface_id(), id);
|
| -
|
| - SurfaceId surface_id(kArbitraryFrameSinkId, id);
|
| - Surface* surface = manager_.GetSurfaceForId(surface_id);
|
| - surface->AddDestructionDependency(
|
| - SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
|
| - EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_TRUE(client_.returned_resources().empty());
|
| - factory_->Reset();
|
| - EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_FALSE(client_.returned_resources().empty());
|
| - local_surface_id_ = LocalSurfaceId();
|
| -}
|
| -
|
| -// Tests that SurfaceFactory doesn't return resources after Reset() if
|
| -// dependency registered.
|
| -TEST_F(SurfaceFactoryTest, ResetDependencyRegistered) {
|
| - LocalSurfaceId id(7, kArbitraryToken);
|
| -
|
| - TransferableResource resource;
|
| - resource.id = 1;
|
| - resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
|
| - CompositorFrame frame;
|
| - frame.resource_list.push_back(resource);
|
| - factory_->SubmitCompositorFrame(id, std::move(frame),
|
| - SurfaceFactory::DrawCallback());
|
| - EXPECT_EQ(last_created_surface_id().local_surface_id(), id);
|
| -
|
| - manager_.RegisterFrameSinkId(kAnotherArbitraryFrameSinkId);
|
| -
|
| - SurfaceId surface_id(kArbitraryFrameSinkId, id);
|
| - Surface* surface = manager_.GetSurfaceForId(surface_id);
|
| - surface->AddDestructionDependency(
|
| - SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
|
| - EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_TRUE(client_.returned_resources().empty());
|
| - factory_->Reset();
|
| - EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_TRUE(client_.returned_resources().empty());
|
| -
|
| - manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
|
| - EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
|
| - EXPECT_TRUE(client_.returned_resources().empty());
|
| - local_surface_id_ = LocalSurfaceId();
|
| -}
|
| -
|
| TEST_F(SurfaceFactoryTest, DestroySequence) {
|
| LocalSurfaceId local_surface_id2(5, kArbitraryToken);
|
| std::unique_ptr<SurfaceFactory> factory2(
|
|
|