| Index: cc/scheduler/scheduler.h
|
| diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
|
| index 5773bc453d33ea3336449c724b1f1de3dae10491..f202fab209b8683ebab064395aa1ef5d8eac2917 100644
|
| --- a/cc/scheduler/scheduler.h
|
| +++ b/cc/scheduler/scheduler.h
|
| @@ -20,6 +20,7 @@
|
| #include "cc/scheduler/draw_result.h"
|
| #include "cc/scheduler/scheduler_settings.h"
|
| #include "cc/scheduler/scheduler_state_machine.h"
|
| +#include "cc/tiles/tile_priority.h"
|
|
|
| namespace base {
|
| namespace trace_event {
|
| @@ -99,7 +100,8 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
|
| void DidSwapBuffers();
|
| void DidSwapBuffersComplete();
|
|
|
| - void SetImplLatencyTakesPriority(bool impl_latency_takes_priority);
|
| + void SetSmoothnessMode(TreePriority tree_priority,
|
| + ScrollHandlerState scroll_handler_state);
|
|
|
| void NotifyReadyToCommit();
|
| void BeginMainFrameAborted(CommitEarlyOutReason reason);
|
| @@ -126,7 +128,7 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
|
| return !begin_impl_frame_deadline_task_.IsCancelled();
|
| }
|
| bool ImplLatencyTakesPriority() const {
|
| - return state_machine_.impl_latency_takes_priority();
|
| + return state_machine_.ImplLatencyTakesPriority();
|
| }
|
|
|
| // Pass in a main_thread_start_time of base::TimeTicks() if it is not
|
| @@ -201,9 +203,13 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
|
| void DrawAndSwapForced();
|
| void ProcessScheduledActions();
|
| void UpdateCompositorTimingHistoryRecordingEnabled();
|
| - bool ShouldRecoverMainLatency(const BeginFrameArgs& args) const;
|
| - bool ShouldRecoverImplLatency(const BeginFrameArgs& args) const;
|
| - bool CanCommitAndActivateBeforeDeadline(const BeginFrameArgs& args) const;
|
| + bool ShouldRecoverMainLatency(const BeginFrameArgs& args,
|
| + bool can_activate_before_deadline) const;
|
| + bool ShouldRecoverImplLatency(const BeginFrameArgs& args,
|
| + bool can_activate_before_deadline) const;
|
| + bool CanBeginMainFrameAndActivateBeforeDeadline(
|
| + const BeginFrameArgs& args,
|
| + base::TimeDelta bmf_to_activate_estimate) const;
|
| void AdvanceCommitStateIfPossible();
|
| bool IsBeginMainFrameSentOrStarted() const;
|
| void BeginRetroFrame();
|
|
|