Chromium Code Reviews| Index: ui/compositor/layer_unittest.cc |
| diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc |
| index 0783ff05ba7638b7d8d2c56af285a0dfeb53479b..640ff21d46d986bb81d12e406ab5b095607b0480 100644 |
| --- a/ui/compositor/layer_unittest.cc |
| +++ b/ui/compositor/layer_unittest.cc |
| @@ -1139,8 +1139,14 @@ TEST_F(LayerWithNullDelegateTest, EmptyDamagedRect) { |
| WaitForCommit(); |
| EXPECT_TRUE(root->damaged_region_for_testing().IsEmpty()); |
| - compositor()->SetRootLayer(nullptr); |
| - root.reset(); |
| + // The texture mailbox has a reference from an in-flight texture layer. |
|
ericrk
2017/04/24 22:24:08
Thanks for the fix!
|
| + // We clear the texture mailbox from the root layer and draw a new frame |
| + // to ensure that the texture mailbox is released. We then draw a second |
| + // frame to ensure that the mailbox's release callback has time to run. |
|
danakj
2017/04/25 14:20:42
Oh but you could also do fwiw..
make a RunLoop, a
kylechar
2017/04/25 16:25:01
How does this look?
|
| + root->SetShowSolidColorContent(); |
| + compositor()->ScheduleDraw(); |
| + WaitForCommit(); |
| + compositor()->ScheduleDraw(); |
| WaitForCommit(); |
| } |