Index: components/scheduler/renderer/renderer_scheduler_impl.h |
diff --git a/components/scheduler/renderer/renderer_scheduler_impl.h b/components/scheduler/renderer/renderer_scheduler_impl.h |
index bd7d7ad7e978d97e032e7751613f10c61014cf15..f54426e5e978835933805f75e6bdd25326bb9ef3 100644 |
--- a/components/scheduler/renderer/renderer_scheduler_impl.h |
+++ b/components/scheduler/renderer/renderer_scheduler_impl.h |
@@ -50,7 +50,9 @@ class SCHEDULER_EXPORT RendererSchedulerImpl : public RendererScheduler, |
void OnRendererVisible() override; |
void OnRendererBackgrounded() override; |
void OnRendererForegrounded() override; |
- void OnPageLoadStarted() override; |
+ void OnNavigationExpected() override; |
+ void OnNavigationCanceled() override; |
+ void OnNavigationStarted() override; |
bool IsHighPriorityWorkAnticipated() override; |
bool ShouldYieldForHighPriorityWork() override; |
bool CanExceedIdleDeadlineIfRequired() const override; |
@@ -133,6 +135,10 @@ class SCHEDULER_EXPORT RendererSchedulerImpl : public RendererScheduler, |
// other tasks during the initial page load. |
static const int kRailsInitialLoadingPrioritizationMillis = 1000; |
+ // The maximum amount of time to wait for a OnNavigationStarted after a |
+ // OnPageLoadExpected. |
Sami
2015/09/24 14:15:04
s/PageLoad/Navigation/ (in the variable name too)
alex clarke (OOO till 29th)
2015/09/24 14:53:10
I don't need this constant anymore.
|
+ static const int kMaxPageLoadExpectedWaitMillis = 2000; |
+ |
// For the purposes of deciding whether or not it's safe to turn timers and |
// loading tasks on only in idle periods, we regard the system as being as |
// being "idle period" starved if there hasn't been an idle period in the last |
@@ -247,6 +253,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl : public RendererScheduler, |
base::TimeTicks last_idle_period_end_time; |
base::TimeTicks rails_loading_priority_deadline; |
UserModel user_model; |
+ bool navigation_expected; |
Sami
2015/09/24 14:15:04
Should this on the main thread struct instead? I t
alex clarke (OOO till 29th)
2015/09/24 14:53:10
Done.
|
bool awaiting_touch_start_response; |
bool in_idle_period; |
bool begin_main_frame_on_critical_path; |