diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-16 22:09:46 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-16 22:09:46 +0000 |
| commit | 331b37150f3730e8fe0417fa2d5528b1b66799b6 (patch) | |
| tree | 869f87444b5cfa02a01209921f6e1a063e394452 /cc/scheduler | |
| parent | 935b28f64166d3e83c5d3dbc770b6e64e3d20fed (diff) | |
| download | chromium_src-331b37150f3730e8fe0417fa2d5528b1b66799b6.zip chromium_src-331b37150f3730e8fe0417fa2d5528b1b66799b6.tar.gz chromium_src-331b37150f3730e8fe0417fa2d5528b1b66799b6.tar.bz2 | |
cc: Add more DrawSwapReadbackResult enums
BUG=329552
Review URL: https://codereview.chromium.org/162473003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scheduler')
| -rw-r--r-- | cc/scheduler/draw_swap_readback_result.h | 3 | ||||
| -rw-r--r-- | cc/scheduler/scheduler_state_machine.cc | 6 | ||||
| -rw-r--r-- | cc/scheduler/scheduler_state_machine_unittest.cc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cc/scheduler/draw_swap_readback_result.h b/cc/scheduler/draw_swap_readback_result.h index 8b875a4..a87a08b 100644 --- a/cc/scheduler/draw_swap_readback_result.h +++ b/cc/scheduler/draw_swap_readback_result.h @@ -13,6 +13,9 @@ struct DrawSwapReadbackResult { DRAW_SUCCESS, DRAW_ABORTED_CHECKERBOARD_ANIMATIONS, DRAW_ABORTED_MISSING_HIGH_RES_CONTENT, + DRAW_ABORTED_CANT_READBACK, + DRAW_ABORTED_CONTEXT_LOST, + DRAW_ABORTED_CANT_DRAW, }; DrawSwapReadbackResult() diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc index 947637d..5b87b18 100644 --- a/cc/scheduler/scheduler_state_machine.cc +++ b/cc/scheduler/scheduler_state_machine.cc @@ -1038,6 +1038,12 @@ void SchedulerStateMachine::DidDrawIfPossibleCompleted( case DrawSwapReadbackResult::INVALID_RESULT: NOTREACHED() << "Uninitialized DrawSwapReadbackResult."; break; + case DrawSwapReadbackResult::DRAW_ABORTED_CANT_DRAW: + case DrawSwapReadbackResult::DRAW_ABORTED_CANT_READBACK: + case DrawSwapReadbackResult::DRAW_ABORTED_CONTEXT_LOST: + NOTREACHED() << "Invalid return value from DrawAndSwapIfPossible:" + << result; + break; case DrawSwapReadbackResult::DRAW_SUCCESS: consecutive_checkerboard_animations_ = 0; forced_redraw_state_ = FORCED_REDRAW_STATE_IDLE; diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc index 4b95f99..e3963f2 100644 --- a/cc/scheduler/scheduler_state_machine_unittest.cc +++ b/cc/scheduler/scheduler_state_machine_unittest.cc @@ -207,7 +207,7 @@ TEST(SchedulerStateMachineTest, EXPECT_TRUE(state.CommitPending()); } -TEST(SchedulerStateMachineTest, TestFailedDrawForMissingHighResDoesNothing) { +TEST(SchedulerStateMachineTest, TestFailedDrawForMissingHighResNeedsCommit) { SchedulerSettings default_scheduler_settings; StateMachine state(default_scheduler_settings); state.SetCanStart(); |