Making OutputSurface a begin frame source and vsync source.

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 <algorithm>
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
@@ skipping 43 matching lines @@
 BeginFrameSource* Scheduler::GetPrimaryBeginFrameSource() {
   if (!settings_.throttle_frame_production) {
     TRACE_EVENT1("cc",
                  "Scheduler::Scheduler()",
                  "PrimaryFrameSource",
                  "BackToBackBeginFrameSource");
     primary_frame_source_internal_ =
         BackToBackBeginFrameSource::Create(task_runner_.get());
     return primary_frame_source_internal_.get();
   } else if (settings_.begin_frame_scheduling_enabled) {
-    TRACE_EVENT1("cc",
-                 "Scheduler::Scheduler()",
-                 "PrimaryFrameSource",
-                 "SchedulerClient");
-    return client_->GetExternalBeginFrameSource();
+    TRACE_EVENT1(
+        "cc", "Scheduler::Scheduler()", "PrimaryFrameSource", "OutputSurface");
+    return NULL;
   } else {
     TRACE_EVENT1("cc",
                  "Scheduler::Scheduler()",
                  "PrimaryFrameSource",
                  "SyntheticBeginFrameSource");
     scoped_ptr<SyntheticBeginFrameSource> synthetic_source =
         SyntheticBeginFrameSource::Create(
             task_runner_.get(), Now(), BeginFrameArgs::DefaultInterval());
     vsync_observer_ = synthetic_source.get();
     primary_frame_source_internal_ = synthetic_source.Pass();
@@ skipping 44 matching lines @@
 void Scheduler::SetEstimatedParentDrawTime(base::TimeDelta draw_time) {
   DCHECK_GE(draw_time.ToInternalValue(), 0);
   estimated_parent_draw_time_ = draw_time;
 }
 
 void Scheduler::SetCanStart() {
   state_machine_.SetCanStart();
   ProcessScheduledActions();
 }
 
+void Scheduler::UpdateActiveFrameSource() {
+  if (state_machine_.visible() && primary_frame_source_) {
+    frame_source_->SetActiveSource(primary_frame_source_);
+  } else {
+    frame_source_->SetActiveSource(background_frame_source_);
+  }
+}
+
 void Scheduler::SetVisible(bool visible) {
   state_machine_.SetVisible(visible);
-  if (visible) {
-    frame_source_->SetActiveSource(primary_frame_source_);
-  } else {
-    frame_source_->SetActiveSource(background_frame_source_);
-  }
+  UpdateActiveFrameSource();
   ProcessScheduledActions();
 }
 
 void Scheduler::SetCanDraw(bool can_draw) {
   state_machine_.SetCanDraw(can_draw);
   ProcessScheduledActions();
 }
 
 void Scheduler::NotifyReadyToActivate() {
   state_machine_.NotifyReadyToActivate();
@@ skipping 62 matching lines @@
   ProcessScheduledActions();
 }
 
 void Scheduler::DidManageTiles() {
   state_machine_.DidManageTiles();
 }
 
 void Scheduler::DidLoseOutputSurface() {
   TRACE_EVENT0("cc", "Scheduler::DidLoseOutputSurface");
   state_machine_.DidLoseOutputSurface();
+
+  if (settings_.throttle_frame_production &&
+      settings_.begin_frame_scheduling_enabled && primary_frame_source_) {
+    frame_source_->RemoveSource(primary_frame_source_);
+    primary_frame_source_ = NULL;
+    UpdateActiveFrameSource();
+  }
+
   if (frame_source_->NeedsBeginFrames())
     frame_source_->SetNeedsBeginFrames(false);
+
   begin_retro_frame_args_.clear();
   ProcessScheduledActions();
 }
 
-void Scheduler::DidCreateAndInitializeOutputSurface() {
+void Scheduler::DidCreateAndInitializeOutputSurface(
+    OutputSurface* output_surface) {
   TRACE_EVENT0("cc", "Scheduler::DidCreateAndInitializeOutputSurface");
-  DCHECK(!frame_source_->NeedsBeginFrames());
   DCHECK(begin_impl_frame_deadline_task_.IsCancelled());
+
+  if (settings_.throttle_frame_production &&
+      settings_.begin_frame_scheduling_enabled) {
+    DCHECK(!primary_frame_source_);
+    primary_frame_source_ = output_surface;
+    frame_source_->AddSource(primary_frame_source_);
+  }
+  UpdateActiveFrameSource();
   state_machine_.DidCreateAndInitializeOutputSurface();
   ProcessScheduledActions();
 }
 
 void Scheduler::NotifyBeginMainFrameStarted() {
   TRACE_EVENT0("cc", "Scheduler::NotifyBeginMainFrameStarted");
   state_machine_.NotifyBeginMainFrameStarted();
 }
 
 base::TimeTicks Scheduler::AnticipatedDrawTime() const {
@@ skipping 457 matching lines @@
 }
 
 bool Scheduler::IsBeginMainFrameSentOrStarted() const {
   return (state_machine_.commit_state() ==
               SchedulerStateMachine::COMMIT_STATE_BEGIN_MAIN_FRAME_SENT ||
           state_machine_.commit_state() ==
               SchedulerStateMachine::COMMIT_STATE_BEGIN_MAIN_FRAME_STARTED);
 }
 
 }  // namespace cc