| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/test/layer_tree_test_common.h" | 5 #include "cc/test/layer_tree_test_common.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation.h" | 7 #include "cc/animation/animation.h" |
| 8 #include "cc/animation/animation_registrar.h" | 8 #include "cc/animation/animation_registrar.h" |
| 9 #include "cc/animation/layer_animation_controller.h" | 9 #include "cc/animation/layer_animation_controller.h" |
| 10 #include "cc/animation/timing_function.h" | 10 #include "cc/animation/timing_function.h" |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 } | 420 } |
| 421 | 421 |
| 422 MessageLoop::current()->Quit(); | 422 MessageLoop::current()->Quit(); |
| 423 } | 423 } |
| 424 | 424 |
| 425 void ThreadedTest::dispatchAddInstantAnimation() | 425 void ThreadedTest::dispatchAddInstantAnimation() |
| 426 { | 426 { |
| 427 DCHECK(!proxy() || proxy()->IsMainThread()); | 427 DCHECK(!proxy() || proxy()->IsMainThread()); |
| 428 | 428 |
| 429 if (m_layerTreeHost.get() && m_layerTreeHost->root_layer()) | 429 if (m_layerTreeHost.get() && m_layerTreeHost->root_layer()) |
| 430 addOpacityTransitionToLayer(*m_layerTreeHost->root_layer(), 0, 0, 0.5, f
alse); | 430 AddOpacityTransitionToLayer(m_layerTreeHost->root_layer(), 0, 0, 0.5, fa
lse); |
| 431 } | 431 } |
| 432 | 432 |
| 433 void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation) | 433 void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation) |
| 434 { | 434 { |
| 435 DCHECK(!proxy() || proxy()->IsMainThread()); | 435 DCHECK(!proxy() || proxy()->IsMainThread()); |
| 436 | 436 |
| 437 if (layerToReceiveAnimation) | 437 if (layerToReceiveAnimation) |
| 438 addOpacityTransitionToLayer(*layerToReceiveAnimation, 10, 0, 0.5, true); | 438 AddOpacityTransitionToLayer(layerToReceiveAnimation, 10, 0, 0.5, true); |
| 439 } | 439 } |
| 440 | 440 |
| 441 void ThreadedTest::dispatchSetNeedsCommit() | 441 void ThreadedTest::dispatchSetNeedsCommit() |
| 442 { | 442 { |
| 443 DCHECK(!proxy() || proxy()->IsMainThread()); | 443 DCHECK(!proxy() || proxy()->IsMainThread()); |
| 444 | 444 |
| 445 if (m_layerTreeHost.get()) | 445 if (m_layerTreeHost.get()) |
| 446 m_layerTreeHost->SetNeedsCommit(); | 446 m_layerTreeHost->SetNeedsCommit(); |
| 447 } | 447 } |
| 448 | 448 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 ASSERT_FALSE(m_layerTreeHost.get()); | 519 ASSERT_FALSE(m_layerTreeHost.get()); |
| 520 m_client.reset(); | 520 m_client.reset(); |
| 521 if (m_timedOut) { | 521 if (m_timedOut) { |
| 522 FAIL() << "Test timed out"; | 522 FAIL() << "Test timed out"; |
| 523 return; | 523 return; |
| 524 } | 524 } |
| 525 afterTest(); | 525 afterTest(); |
| 526 } | 526 } |
| 527 | 527 |
| 528 } // namespace cc | 528 } // namespace cc |
| OLD | NEW |