| Index: cc/test/layer_tree_test_common.cc
|
| diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
|
| index 2bb5d41ba5176758c09d417cb403c9548211551b..0d77c67bedaefb1e77c73a4306ebbd0fe569712c 100644
|
| --- a/cc/test/layer_tree_test_common.cc
|
| +++ b/cc/test/layer_tree_test_common.cc
|
| @@ -350,9 +350,9 @@ void ThreadedTest::postSetNeedsAnimateToMainThread()
|
| m_mainThreadProxy->postTask(createThreadTask(this, &ThreadedTest::dispatchSetNeedsAnimate));
|
| }
|
|
|
| -void ThreadedTest::postAddAnimationToMainThread()
|
| +void ThreadedTest::postAddAnimationToMainThread(Layer* layerToReceiveAnimation)
|
| {
|
| - m_mainThreadProxy->postTask(createThreadTask(this, &ThreadedTest::dispatchAddAnimation));
|
| + m_mainThreadProxy->postTask(createThreadTask(this, &ThreadedTest::dispatchAddAnimation, layerToReceiveAnimation));
|
| }
|
|
|
| void ThreadedTest::postAddInstantAnimationToMainThread()
|
| @@ -456,15 +456,15 @@ void ThreadedTest::dispatchAddInstantAnimation()
|
| addOpacityTransitionToLayer(*m_layerTreeHost->rootLayer(), 0, 0, 0.5, false);
|
| }
|
|
|
| -void ThreadedTest::dispatchAddAnimation()
|
| +void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation)
|
| {
|
| DCHECK(Proxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
|
|
| - if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
|
| - addOpacityTransitionToLayer(*m_layerTreeHost->rootLayer(), 10, 0, 0.5, true);
|
| + if (layerToReceiveAnimation)
|
| + addOpacityTransitionToLayer(*layerToReceiveAnimation, 10, 0, 0.5, true);
|
| }
|
|
|
| void ThreadedTest::dispatchSetNeedsAnimateAndCommit()
|
|
|