| 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 742c00cb2cb61e5455676af2a86bb4f5b9bd8ebe..66ebc41979780a248aa6ff64b9409266e570c3d1 100644
|
| --- a/cc/trees/layer_tree_host_unittest_animation.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc
|
| @@ -46,7 +46,7 @@ class LayerTreeHostAnimationTestSetNeedsAnimateShouldNotSetCommitRequested
|
|
|
| layer_tree_host()->SetNeedsAnimate();
|
| // Right now, CommitRequested is going to be true, because during
|
| - // BeginFrame, we force CommitRequested to true to prevent requests from
|
| + // BeginMainFrame, we force CommitRequested to true to prevent requests from
|
| // hitting the impl thread. But, when the next DidCommit happens, we should
|
| // verify that CommitRequested has gone back to false.
|
| }
|
| @@ -75,9 +75,9 @@ MULTI_THREAD_TEST_F(
|
| LayerTreeHostAnimationTestSetNeedsAnimateShouldNotSetCommitRequested);
|
|
|
| // Trigger a frame with SetNeedsCommit. Then, inside the resulting animate
|
| -// callback, requet another frame using SetNeedsAnimate. End the test when
|
| +// callback, request another frame using SetNeedsAnimate. End the test when
|
| // animate gets called yet-again, indicating that the proxy is correctly
|
| -// handling the case where SetNeedsAnimate() is called inside the begin frame
|
| +// handling the case where SetNeedsAnimate() is called inside the BeginMainFrame
|
| // flow.
|
| class LayerTreeHostAnimationTestSetNeedsAnimateInsideAnimationCallback
|
| : public LayerTreeHostAnimationTest {
|
| @@ -761,7 +761,7 @@ class LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations
|
| virtual void DidCommitAndDrawFrame() OVERRIDE {
|
| switch (layer_tree_host()->commit_number()) {
|
| case 1:
|
| - // The animation is longer than 1 vsync.
|
| + // The animation is longer than 1 BeginImplFrame interval.
|
| AddOpacityTransitionToLayer(content_, 0.1, 0.2f, 0.8f, false);
|
| added_animations_++;
|
| break;
|
|
|