| Index: components/exo/buffer_unittest.cc
|
| diff --git a/components/exo/buffer_unittest.cc b/components/exo/buffer_unittest.cc
|
| index bc708aa6db19182ba9f14f22d40089e0de60539e..a2ea78c4d753216dbcba8969c8a355e9ee74be88 100644
|
| --- a/components/exo/buffer_unittest.cc
|
| +++ b/components/exo/buffer_unittest.cc
|
| @@ -39,12 +39,15 @@ TEST_F(BufferTest, ReleaseCallback) {
|
|
|
| // Produce a texture mailbox for the contents of the buffer.
|
| cc::TextureMailbox texture_mailbox;
|
| + base::Closure detach_callback;
|
| std::unique_ptr<cc::SingleReleaseCallback> buffer_release_callback =
|
| - buffer->ProduceTextureMailbox(&texture_mailbox, false, true);
|
| + buffer->ProduceTextureMailbox(&texture_mailbox, false, true,
|
| + &detach_callback);
|
| ASSERT_TRUE(buffer_release_callback);
|
|
|
| // Release buffer.
|
| buffer_release_callback->Run(gpu::SyncToken(), false);
|
| + detach_callback.Run();
|
|
|
| // Release() should have been called exactly once.
|
| ASSERT_EQ(release_call_count, 1);
|
| @@ -55,10 +58,12 @@ TEST_F(BufferTest, IsLost) {
|
| std::unique_ptr<Buffer> buffer(
|
| new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
|
|
|
| + base::Closure detach_callback;
|
| // Acquire a texture mailbox for the contents of the buffer.
|
| cc::TextureMailbox texture_mailbox;
|
| std::unique_ptr<cc::SingleReleaseCallback> buffer_release_callback =
|
| - buffer->ProduceTextureMailbox(&texture_mailbox, false, true);
|
| + buffer->ProduceTextureMailbox(&texture_mailbox, false, true,
|
| + &detach_callback);
|
| ASSERT_TRUE(buffer_release_callback);
|
|
|
| scoped_refptr<cc::ContextProvider> context_provider =
|
| @@ -71,15 +76,21 @@ TEST_F(BufferTest, IsLost) {
|
| GL_INNOCENT_CONTEXT_RESET_ARB);
|
| }
|
|
|
| + // Release buffer.
|
| + bool is_lost = true;
|
| + buffer_release_callback->Run(gpu::SyncToken(), is_lost);
|
| +
|
| + base::Closure detach_callback2;
|
| // Producing a new texture mailbox for the contents of the buffer.
|
| std::unique_ptr<cc::SingleReleaseCallback> buffer_release_callback2 =
|
| - buffer->ProduceTextureMailbox(&texture_mailbox, false, false);
|
| + buffer->ProduceTextureMailbox(&texture_mailbox, false, false,
|
| + &detach_callback2);
|
| ASSERT_TRUE(buffer_release_callback);
|
|
|
| - // Release buffer.
|
| - bool is_lost = true;
|
| - buffer_release_callback->Run(gpu::SyncToken(), is_lost);
|
| + detach_callback.Run();
|
| +
|
| buffer_release_callback2->Run(gpu::SyncToken(), false);
|
| + detach_callback2.Run();
|
| }
|
|
|
| } // namespace
|
|
|