diff options
| author | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 20:09:23 +0000 |
|---|---|---|
| committer | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 20:09:23 +0000 |
| commit | e81bd450b8ea65aeaec58c01f02e7ef0f197df92 (patch) | |
| tree | c9a2bc5210243845c29e2d6e2ecb63e07c62447d /cc | |
| parent | 810fee6552427459f7bf732b1ac61f375fdad107 (diff) | |
| download | chromium_src-e81bd450b8ea65aeaec58c01f02e7ef0f197df92.zip chromium_src-e81bd450b8ea65aeaec58c01f02e7ef0f197df92.tar.gz chromium_src-e81bd450b8ea65aeaec58c01f02e7ef0f197df92.tar.bz2 | |
Fix flake in LayerTreeHostAnimationTestFrozenAnimationTickTime
This changes the test to make sure it doesn't expect animations to
be frozen after EndTest(), since after this point we allow draws to
succeed.
BUG=344078
Review URL: https://codereview.chromium.org/170593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/trees/layer_tree_host_unittest_animation.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index e1aef3d..165d30b 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc @@ -1080,6 +1080,8 @@ class LayerTreeHostAnimationTestFrozenAnimationTickTime virtual void AnimateLayers(LayerTreeHostImpl* host_impl, base::TimeTicks monotonic_time) OVERRIDE { + if (TestEnded()) + return; if (!started_animating_) { started_animating_ = true; expected_impl_tick_time_ = monotonic_time; |