| commit | 6a64b814b5f9ccdea00f64228f15a3d8fbd31790 | [log] [tgz] |
|---|---|---|
| author | James Robinson <jamesr@chromium.org> | Wed Dec 03 13:38:42 2014 -0800 |
| committer | James Robinson <jamesr@chromium.org> | Wed Dec 03 13:38:42 2014 -0800 |
| tree | 3db4801ae7c4fd14847db50c143c9685630af1f1 | |
| parent | c9b163e587844fa5c25589116d016b6004ac66a5 [diff] [blame] |
Update from https://crrev.com/306655 Includes updates to ui/ and mojo/services for cc and gpu changes and a minor update to a unit test in sky/ for skia interface changes. Review URL: https://codereview.chromium.org/761903003
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h index c69c959..12f8635 100644 --- a/cc/scheduler/scheduler_state_machine.h +++ b/cc/scheduler/scheduler_state_machine.h
@@ -68,6 +68,7 @@ COMMIT_STATE_BEGIN_MAIN_FRAME_STARTED, COMMIT_STATE_READY_TO_COMMIT, COMMIT_STATE_WAITING_FOR_ACTIVATION, + COMMIT_STATE_WAITING_FOR_DRAW, }; static const char* CommitStateToString(CommitState state);