diff options
| author | loyso <loyso@chromium.org> | 2016-01-06 15:10:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 23:11:26 +0000 |
| commit | 8ce123b626b8f376dcc864823a22d9ce6120b505 (patch) | |
| tree | 608cea5a69465160974ec2a110c561f4159b1036 /cc/test | |
| parent | 9640699f0d7fc9cd4cb640557bd5459b71873192 (diff) | |
| download | chromium_src-8ce123b626b8f376dcc864823a22d9ce6120b505.zip chromium_src-8ce123b626b8f376dcc864823a22d9ce6120b505.tar.gz chromium_src-8ce123b626b8f376dcc864823a22d9ce6120b505.tar.bz2 | |
CC Animation: Make sure that all tests use_compositor_animation_timelines
Set use_compositor_animation_timelines explicitly to true even for the tests which don't run any animations.
BUG=394777
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1542053002
Cr-Commit-Position: refs/heads/master@{#367945}
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/fake_layer_tree_host.cc | 1 | ||||
| -rw-r--r-- | cc/test/layer_tree_settings_for_testing.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc index f57cad8..05ecd6a3 100644 --- a/cc/test/fake_layer_tree_host.cc +++ b/cc/test/fake_layer_tree_host.cc @@ -32,6 +32,7 @@ scoped_ptr<FakeLayerTreeHost> FakeLayerTreeHost::Create( TestTaskGraphRunner* task_graph_runner) { LayerTreeSettings settings; settings.verify_property_trees = true; + settings.use_compositor_animation_timelines = true; return Create(client, task_graph_runner, settings); } diff --git a/cc/test/layer_tree_settings_for_testing.cc b/cc/test/layer_tree_settings_for_testing.cc index 855d9f5..952bb70 100644 --- a/cc/test/layer_tree_settings_for_testing.cc +++ b/cc/test/layer_tree_settings_for_testing.cc @@ -8,6 +8,7 @@ namespace cc { LayerTreeSettingsForTesting::LayerTreeSettingsForTesting() : LayerTreeSettings() { + this->use_compositor_animation_timelines = true; this->verify_property_trees = true; } |