Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation_curve.h" | 7 #include "cc/animation/animation_curve.h" |
| 8 #include "cc/animation/layer_animation_controller.h" | 8 #include "cc/animation/layer_animation_controller.h" |
| 9 #include "cc/animation/scroll_offset_animation_curve.h" | 9 #include "cc/animation/scroll_offset_animation_curve.h" |
| 10 #include "cc/animation/timing_function.h" | 10 #include "cc/animation/timing_function.h" |
| (...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 924 controller_impl->AbortAnimations(Animation::TRANSFORM); | 924 controller_impl->AbortAnimations(Animation::TRANSFORM); |
| 925 EndTest(); | 925 EndTest(); |
| 926 } | 926 } |
| 927 | 927 |
| 928 void AfterTest() override {} | 928 void AfterTest() override {} |
| 929 | 929 |
| 930 FakeContentLayerClient client_; | 930 FakeContentLayerClient client_; |
| 931 scoped_refptr<Layer> layer_; | 931 scoped_refptr<Layer> layer_; |
| 932 }; | 932 }; |
| 933 | 933 |
| 934 // Flaky on Windows: http://crbug.com/527087 | |
|
danakj
2015/09/01 20:41:46
It would be flaky everywhere. You can just comment
| |
| 935 #if !defined(OS_WIN) | |
| 934 SINGLE_AND_MULTI_THREAD_TEST_F( | 936 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 935 LayerTreeHostAnimationTestPendingTreeAnimatesFirstCommit); | 937 LayerTreeHostAnimationTestPendingTreeAnimatesFirstCommit); |
| 938 #endif | |
| 936 | 939 |
| 937 // When a layer with an animation is removed from the tree and later re-added, | 940 // When a layer with an animation is removed from the tree and later re-added, |
| 938 // the animation should resume. | 941 // the animation should resume. |
| 939 class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded | 942 class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded |
| 940 : public LayerTreeHostAnimationTest { | 943 : public LayerTreeHostAnimationTest { |
| 941 public: | 944 public: |
| 942 void SetupTree() override { | 945 void SetupTree() override { |
| 943 LayerTreeHostAnimationTest::SetupTree(); | 946 LayerTreeHostAnimationTest::SetupTree(); |
| 944 layer_ = Layer::Create(layer_settings()); | 947 layer_ = Layer::Create(layer_settings()); |
| 945 layer_->SetBounds(gfx::Size(4, 4)); | 948 layer_->SetBounds(gfx::Size(4, 4)); |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1302 bool called_animation_finished_; | 1305 bool called_animation_finished_; |
| 1303 FakeContentLayerClient client_; | 1306 FakeContentLayerClient client_; |
| 1304 scoped_refptr<FakePictureLayer> picture_; | 1307 scoped_refptr<FakePictureLayer> picture_; |
| 1305 }; | 1308 }; |
| 1306 | 1309 |
| 1307 SINGLE_AND_MULTI_THREAD_TEST_F( | 1310 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 1308 LayerTreeHostAnimationTestNotifyAnimationFinished); | 1311 LayerTreeHostAnimationTestNotifyAnimationFinished); |
| 1309 | 1312 |
| 1310 } // namespace | 1313 } // namespace |
| 1311 } // namespace cc | 1314 } // namespace cc |
| OLD | NEW |