Index: cc/layers/texture_layer_unittest.cc |
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc |
index aa08e9f81ee9a854af56afa1ae2527637dd25656..2694a1ab38c661479b1b75c55618d9ef2e9eab30 100644 |
--- a/cc/layers/texture_layer_unittest.cc |
+++ b/cc/layers/texture_layer_unittest.cc |
@@ -1022,7 +1022,7 @@ class TextureLayerWithMailboxMainThreadDeleted : public LayerTreeTest { |
PostSetNeedsCommitToMainThread(); |
} |
- virtual void DidCommitAndDrawFrame() OVERRIDE { |
+ virtual void DidCommit() OVERRIDE { |
switch (layer_tree_host()->source_frame_number()) { |
case 1: |
// Delete the TextureLayer on the main thread while the mailbox is in |
@@ -1090,7 +1090,7 @@ class TextureLayerWithMailboxImplThreadDeleted : public LayerTreeTest { |
PostSetNeedsCommitToMainThread(); |
} |
- virtual void DidCommitAndDrawFrame() OVERRIDE { |
+ virtual void DidCommit() OVERRIDE { |
enne (OOO)
2013/08/06 23:35:16
It seems like this is not testing what it should b
brianderson
2013/08/07 01:55:51
I changed this so that DidActivateTreeOnThread pos
enne (OOO)
2013/08/07 15:44:19
Yeah, that seems like the right approach.
piman
2013/08/07 19:39:52
I would prefer that we wait for a frame to be draw
brianderson
2013/08/07 20:12:29
It's possible that DidCommitAndDrawFrame doesn't g
piman
2013/08/07 20:27:45
You want to make sure you wait for the commit *and
brianderson
2013/08/07 20:33:01
This patch doesn't allow 2 commits in flight, but
|
switch (layer_tree_host()->source_frame_number()) { |
case 1: |
// Remove the TextureLayer on the main thread while the mailbox is in |