diff options
| author | mithro <mithro@mithis.com> | 2014-11-04 23:41:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-05 07:43:37 +0000 |
| commit | 8b794fe7e4eda70ec746f4e1ff15c3c3aec50ff3 (patch) | |
| tree | ff6aa64cd3f8821ba98502d00601125f284c2244 /cc/scheduler/scheduler_state_machine_unittest.cc | |
| parent | 683ede85fb6da926933fcb91a6efd57f84ac0204 (diff) | |
| download | chromium_src-8b794fe7e4eda70ec746f4e1ff15c3c3aec50ff3.zip chromium_src-8b794fe7e4eda70ec746f4e1ff15c3c3aec50ff3.tar.gz chromium_src-8b794fe7e4eda70ec746f4e1ff15c3c3aec50ff3.tar.bz2 | |
Revert of Moving background animation ticking from LayerTreeHostImpl into the Scheduler. (patchset #9 id:460001 of https://codereview.chromium.org/595973002/)
Reason for revert:
Reverting because of failure here http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29
Will investigate tomorrow.
Original issue's description:
> Moving background animation ticking from LayerTreeHostImpl into the Scheduler.
>
> Background ticking currently happens in the LayerTreeHostImpl, this makes it very hard to preserve the monotonicity guarantee needed by frame times. http://crrev.com/267783004 set up the scheduler to become the source of background ticks and this CL makes use of that functionality.
>
> BUG=345459
>
> Committed: https://crrev.com/4df3c4366015739a7c6b6c1539a8d7c9198e38ef
> Cr-Commit-Position: refs/heads/master@{#302757}
TBR=danakj@chromium.org,brianderson@chromium.org,skyostil@chromium.org,ajuma@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=345459
Review URL: https://codereview.chromium.org/698413002
Cr-Commit-Position: refs/heads/master@{#302763}
Diffstat (limited to 'cc/scheduler/scheduler_state_machine_unittest.cc')
| -rw-r--r-- | cc/scheduler/scheduler_state_machine_unittest.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc index 85160ed..e3530c8 100644 --- a/cc/scheduler/scheduler_state_machine_unittest.cc +++ b/cc/scheduler/scheduler_state_machine_unittest.cc @@ -703,7 +703,6 @@ TEST(SchedulerStateMachineTest, state.SetVisible(true); state.SetCanDraw(false); state.OnBeginImplFrame(CreateBeginFrameArgsForTesting()); - EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ANIMATE); EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_SWAP_ABORT); EXPECT_ACTION_UPDATE_STATE( SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME); @@ -712,7 +711,6 @@ TEST(SchedulerStateMachineTest, state.NotifyReadyToCommit(); EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT); state.OnBeginImplFrameDeadline(); - EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ANIMATE); EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_AND_SWAP_ABORT); EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE); } |