Update from https://crrev.com/307330
Includes several sky updates for skia API changes and the gn format
presubmit check from https://codereview.chromium.org/779193003/
Review URL: https://codereview.chromium.org/786123002
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index 12f8635..6e30694 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -62,6 +62,14 @@
};
static const char* BeginImplFrameStateToString(BeginImplFrameState state);
+ enum BeginImplFrameDeadlineMode {
+ BEGIN_IMPL_FRAME_DEADLINE_MODE_IMMEDIATE,
+ BEGIN_IMPL_FRAME_DEADLINE_MODE_REGULAR,
+ BEGIN_IMPL_FRAME_DEADLINE_MODE_LATE,
+ };
+ static const char* BeginImplFrameDeadlineModeToString(
+ BeginImplFrameDeadlineMode mode);
+
enum CommitState {
COMMIT_STATE_IDLE,
COMMIT_STATE_BEGIN_MAIN_FRAME_SENT,
@@ -128,10 +136,10 @@
void OnBeginImplFrameDeadlinePending();
void OnBeginImplFrameDeadline();
void OnBeginImplFrameIdle();
- bool ShouldTriggerBeginImplFrameDeadlineEarly() const;
BeginImplFrameState begin_impl_frame_state() const {
return begin_impl_frame_state_;
}
+ BeginImplFrameDeadlineMode CurrentBeginImplFrameDeadlineMode() const;
// If the main thread didn't manage to produce a new frame in time for the
// impl thread to draw, it is in a high latency mode.
@@ -258,6 +266,8 @@
bool BeginFrameNeededForChildren() const;
bool ProactiveBeginFrameWanted() const;
+ bool ShouldTriggerBeginImplFrameDeadlineImmediately() const;
+
// True if we need to force activations to make forward progress.
bool PendingActivationsShouldBeForced() const;
