| 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 cfd8a1489af4a06f045b1b817c18b83ed721c852..470be01cd99eae92e05abb28b514a44146269f08 100644
|
| --- a/cc/trees/layer_tree_host_unittest_animation.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc
|
| @@ -348,8 +348,9 @@ class LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree
|
| LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree()
|
| : active_tree_was_animated_(false) {}
|
|
|
| - base::TimeDelta LowFrequencyAnimationInterval() const override {
|
| - return base::TimeDelta::FromMilliseconds(4);
|
| + base::TimeDelta BackgroundAnimationInterval(LayerTreeHostImpl* host_impl) {
|
| + return base::TimeDelta::FromSecondsD(
|
| + 1.0 / host_impl->settings().background_animation_rate);
|
| }
|
|
|
| void BeginTest() override {
|
| @@ -409,10 +410,9 @@ class LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree
|
| FROM_HERE,
|
| base::Bind(
|
| &LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree::
|
| - UnblockActivations,
|
| - base::Unretained(this),
|
| - host_impl),
|
| - 4 * LowFrequencyAnimationInterval());
|
| + UnblockActivations,
|
| + base::Unretained(this), host_impl),
|
| + 4 * BackgroundAnimationInterval(host_impl));
|
| }
|
| }
|
|
|
| @@ -447,10 +447,9 @@ class LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree
|
| FROM_HERE,
|
| base::Bind(
|
| &LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree::
|
| - InitiateNextCommit,
|
| - base::Unretained(this),
|
| - host_impl),
|
| - 4 * LowFrequencyAnimationInterval());
|
| + InitiateNextCommit,
|
| + base::Unretained(this), host_impl),
|
| + 4 * BackgroundAnimationInterval(host_impl));
|
| }
|
| }
|
|
|
|
|