cc: Add BeginFrameArgs

cc/scheduler/scheduler.cc

 // 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.
 
 #include "cc/scheduler/scheduler.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/base/thread.h"
 
 namespace cc {
 
 Scheduler::Scheduler(SchedulerClient* client,
                      const SchedulerSettings& scheduler_settings)
     : settings_(scheduler_settings),
       client_(client),
       weak_factory_(this),
       last_set_needs_begin_frame_(false),
       has_pending_begin_frame_(false),
-      last_begin_frame_time_(base::TimeTicks()),
-      // TODO(brianderson): Pass with BeginFrame in the near future.
-      interval_(base::TimeDelta::FromMicroseconds(16666)),
       state_machine_(scheduler_settings),
       inside_process_scheduled_actions_(false) {
   DCHECK(client_);
   DCHECK(!state_machine_.BeginFrameNeededByImplThread());
 }
 
 Scheduler::~Scheduler() {
   client_->SetNeedsBeginFrameOnImplThread(false);
 }
 
@@ skipping 69 matching lines @@
 void Scheduler::DidCreateAndInitializeOutputSurface() {
   TRACE_EVENT0("cc", "Scheduler::DidCreateAndInitializeOutputSurface");
   state_machine_.DidCreateAndInitializeOutputSurface();
   has_pending_begin_frame_ = false;
   last_set_needs_begin_frame_ = false;
   ProcessScheduledActions();
 }
 
 base::TimeTicks Scheduler::AnticipatedDrawTime() {
   TRACE_EVENT0("cc", "Scheduler::AnticipatedDrawTime");
+
+  // TODO(brianderson): Express this in terms of the deadline.
   base::TimeTicks now = base::TimeTicks::Now();
-  int64 intervals = ((now - last_begin_frame_time_) / interval_) + 1;
-  return last_begin_frame_time_ + (interval_ * intervals);
+
+  if (last_begin_frame_args_.interval() <= base::TimeDelta())
+    return now;
+
+  int64 intervals = 1 + ((now - last_begin_frame_args_.frame_time()) /
+                         last_begin_frame_args_.interval());
+  return last_begin_frame_args_.frame_time() +
+      (last_begin_frame_args_.interval() * intervals);
 }
 
 base::TimeTicks Scheduler::LastBeginFrameOnImplThreadTime() {
-  return last_begin_frame_time_;
+  return last_begin_frame_args_.frame_time();
 }
 
 void Scheduler::SetupNextBeginFrameIfNeeded() {
   // Determine if we need BeginFrame notifications.
   // If we do, always request the BeginFrame immediately.
   // If not, only disable on the next BeginFrame to avoid unnecessary toggles.
   // The synchronous renderer compositor requires immediate disables though.
   bool needs_begin_frame = state_machine_.BeginFrameNeededByImplThread();
   if ((needs_begin_frame ||
        state_machine_.inside_begin_frame() ||
        settings_.using_synchronous_renderer_compositor) &&
       (needs_begin_frame != last_set_needs_begin_frame_)) {
     client_->SetNeedsBeginFrameOnImplThread(needs_begin_frame);
     last_set_needs_begin_frame_ = needs_begin_frame;
   }
 
   // Request another BeginFrame if we haven't drawn for now until we have
   // deadlines implemented.
   if (state_machine_.inside_begin_frame() && has_pending_begin_frame_) {
     has_pending_begin_frame_ = false;
     client_->SetNeedsBeginFrameOnImplThread(true);
   }
 }
 
-void Scheduler::BeginFrame(base::TimeTicks frame_time) {
+void Scheduler::BeginFrame(BeginFrameArgs args) {
   TRACE_EVENT0("cc", "Scheduler::BeginFrame");
+  last_begin_frame_args_ = args;
   DCHECK(!has_pending_begin_frame_);
   has_pending_begin_frame_ = true;
-  last_begin_frame_time_ = frame_time;
-  state_machine_.DidEnterBeginFrame();
-  state_machine_.SetFrameTime(frame_time);
+  last_begin_frame_args_ = args;

[Sami, 2013/06/13 10:01:07]

Dupe assignment?

[brianderson, 2013/06/14 20:12:02]

Will fix.

+  state_machine_.DidEnterBeginFrame(args);
   ProcessScheduledActions();
   state_machine_.DidLeaveBeginFrame();
 }
 
 void Scheduler::DrawAndSwapIfPossible() {
   ScheduledActionDrawAndSwapResult result =
       client_->ScheduledActionDrawAndSwapIfPossible();
   state_machine_.DidDrawIfPossibleCompleted(result.did_draw);
   if (result.did_swap)
     has_pending_begin_frame_ = false;
@@ skipping 50 matching lines @@
 
   SetupNextBeginFrameIfNeeded();
   client_->DidAnticipatedDrawTimeChange(AnticipatedDrawTime());
 }
 
 bool Scheduler::WillDrawIfNeeded() const {
   return !state_machine_.DrawSuspendedUntilCommit();
 }
 
 }  // namespace cc