Chromium Code Reviews| Index: cc/trees/layer_tree_host_unittest_animation.cc |
| diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc |
| index 1542a1417b42e508f348affaee33d551e905246b..3b2de64a29c5d3128fcab9cf06d5166d37f8ece3 100644 |
| --- a/cc/trees/layer_tree_host_unittest_animation.cc |
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc |
| @@ -726,9 +726,7 @@ class LayerTreeHostAnimationTestContinuousAnimate |
| : public LayerTreeHostAnimationTest { |
| public: |
| LayerTreeHostAnimationTestContinuousAnimate() |
| - : num_commit_complete_(0), |
| - num_draw_layers_(0) { |
| - } |
| + : num_commit_complete_(0), num_draw_layers_(0), have_animated_(false) {} |
| virtual void SetupTree() OVERRIDE { |
| LayerTreeHostAnimationTest::SetupTree(); |
| @@ -747,6 +745,7 @@ class LayerTreeHostAnimationTestContinuousAnimate |
| if (num_draw_layers_ == 2) |
| return; |
| layer_tree_host()->SetNeedsAnimate(); |
| + have_animated_ = true; |
| } |
| virtual void Layout() OVERRIDE { |
| @@ -767,16 +766,18 @@ class LayerTreeHostAnimationTestContinuousAnimate |
| virtual void AfterTest() OVERRIDE { |
| // Check that we didn't commit twice between first and second draw. |
| EXPECT_EQ(1, num_commit_complete_); |
| + EXPECT_TRUE(have_animated_); |
|
enne (OOO)
2014/06/28 00:11:03
This would fail in the single thread case if the c
|
| } |
| private: |
| int num_commit_complete_; |
| int num_draw_layers_; |
| + bool have_animated_; |
| FakeContentLayerClient client_; |
| scoped_refptr<FakeContentLayer> content_; |
| }; |
| -MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate); |
| +SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate); |
| class LayerTreeHostAnimationTestCancelAnimateCommit |
| : public LayerTreeHostAnimationTest { |