cc: Heuristic for Renderer latency recovery

cc/scheduler/scheduler.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SCHEDULER_SCHEDULER_H_
 #define CC_SCHEDULER_SCHEDULER_H_
 
 #include <deque>
 #include <string>
 
@@ skipping 102 matching lines @@
   bool MainFrameForTestingWillHappen() const {
     return state_machine_.CommitPending() ||
            state_machine_.CouldSendBeginMainFrame();
   }
 
   bool CommitPending() const { return state_machine_.CommitPending(); }
   bool RedrawPending() const { return state_machine_.RedrawPending(); }
   bool PrepareTilesPending() const {
     return state_machine_.PrepareTilesPending();
   }
-  bool MainThreadIsInHighLatencyMode() const {
-    return state_machine_.MainThreadIsInHighLatencyMode();
-  }
   bool BeginImplFrameDeadlinePending() const {
     return !begin_impl_frame_deadline_task_.IsCancelled();
   }
   bool ImplLatencyTakesPriority() const {
     return state_machine_.impl_latency_takes_priority();
   }
 
   void NotifyBeginMainFrameStarted();
 
   base::TimeTicks LastBeginImplFrameTime();
@@ skipping 49 matching lines @@
 
   base::Closure begin_retro_frame_closure_;
   base::Closure begin_impl_frame_deadline_closure_;
   base::CancelableClosure begin_retro_frame_task_;
   base::CancelableClosure begin_impl_frame_deadline_task_;
 
   SchedulerStateMachine state_machine_;
   bool inside_process_scheduled_actions_;
   SchedulerStateMachine::Action inside_action_;
 
- private:
+ protected:
   void ScheduleBeginImplFrameDeadline();
   void ScheduleBeginImplFrameDeadlineIfNeeded();
   void SetupNextBeginFrameIfNeeded();
   void PostBeginRetroFrameIfNeeded();
   void DrawAndSwapIfPossible();
   void DrawAndSwapForced();
   void ProcessScheduledActions();
   void UpdateCompositorTimingHistoryRecordingEnabled();
-  bool CanCommitAndActivateBeforeDeadline() const;
+  bool ShouldRecoverMainLatency(const BeginFrameArgs& args) const;
+  bool ShouldRecoverImplLatency(const BeginFrameArgs& args) const;
+  bool CanCommitAndActivateBeforeDeadline(const BeginFrameArgs& args) const;
   void AdvanceCommitStateIfPossible();
   bool IsBeginMainFrameSentOrStarted() const;
   void BeginRetroFrame();
-  void BeginImplFrameWithDeadline(const BeginFrameArgs& args);
+  // virtual for testing.
+  virtual void BeginImplFrameWithDeadline(const BeginFrameArgs& args);

[sunnyps, 2015/07/09 23:44:30]

Left a comment below about how this isn't necessary. Please remove the virtual
and make these private if you address that.

[brianderson, 2015/07/10 00:34:07]

Done.

   void BeginImplFrameSynchronous(const BeginFrameArgs& args);
   void BeginImplFrame(const BeginFrameArgs& args);
   void FinishImplFrame();
   void OnBeginImplFrameDeadline();
   void PollToAdvanceCommitState();
 
   base::TimeDelta EstimatedParentDrawTime() {
     return estimated_parent_draw_time_;
   }
 
   bool IsInsideAction(SchedulerStateMachine::Action action) {
     return inside_action_ == action;
   }
 
   BeginFrameSource* primary_frame_source() {
     if (settings_.use_external_begin_frame_source) {
       DCHECK(external_frame_source_);
       return external_frame_source_;
     }
     return synthetic_frame_source_.get();
   }
 
   base::WeakPtrFactory<Scheduler> weak_factory_;

[sunnyps, 2015/07/09 23:44:30]

weak_factory_ should always be private.

[brianderson, 2015/07/10 00:34:08]

Done.

 
+ private:
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_