Making OutputSurface a begin frame source and vsync source.

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>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/begin_frame_args.h"
+#include "cc/output/output_surface.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/draw_result.h"
 #include "cc/scheduler/frame_source.h"
 #include "cc/scheduler/scheduler_settings.h"
 #include "cc/scheduler/scheduler_state_machine.h"
 
 namespace base {
 namespace debug {
 class ConvertableToTraceFormat;
 }
 class SingleThreadTaskRunner;
 }
 
 namespace cc {
 
 class SchedulerClient {
  public:
-  virtual BeginFrameSource* GetExternalBeginFrameSource() = 0;
   virtual void WillBeginImplFrame(const BeginFrameArgs& args) = 0;
   virtual void ScheduledActionSendBeginMainFrame() = 0;
   virtual DrawResult ScheduledActionDrawAndSwapIfPossible() = 0;
   virtual DrawResult ScheduledActionDrawAndSwapForced() = 0;
   virtual void ScheduledActionAnimate() = 0;
   virtual void ScheduledActionCommit() = 0;
   virtual void ScheduledActionUpdateVisibleTiles() = 0;
   virtual void ScheduledActionActivateSyncTree() = 0;
   virtual void ScheduledActionBeginOutputSurfaceCreation() = 0;
   virtual void ScheduledActionManageTiles() = 0;
@@ skipping 47 matching lines @@
   void SetSwapUsedIncompleteTile(bool used_incomplete_tile);
   void DidSwapBuffersComplete();
 
   void SetImplLatencyTakesPriority(bool impl_latency_takes_priority);
 
   void NotifyReadyToCommit();
   void BeginMainFrameAborted(bool did_handle);
 
   void DidManageTiles();
   void DidLoseOutputSurface();
-  void DidCreateAndInitializeOutputSurface();
+  void DidCreateAndInitializeOutputSurface(OutputSurface* output_surface);
 
   // Tests do not want to shut down until all possible BeginMainFrames have
   // occured to prevent flakiness.
   bool MainFrameForTestingWillHappen() const {
     return state_machine_.CommitPending() ||
            state_machine_.CouldSendBeginMainFrame();
   }
 
   bool CommitPending() const { return state_machine_.CommitPending(); }
   bool RedrawPending() const { return state_machine_.RedrawPending(); }
@@ skipping 19 matching lines @@
   void SetContinuousPainting(bool continuous_painting) {
     state_machine_.SetContinuousPainting(continuous_painting);
   }
 
   // BeginFrameObserver
   virtual void OnBeginFrame(const BeginFrameArgs& args) OVERRIDE;
   virtual const BeginFrameArgs& LastBeginFrameArgs() const OVERRIDE;
   base::TimeTicks LastBeginImplFrameTime();
 
   ui::CompositorVSyncManager::Observer* vsync_observer_ = NULL;
+
+  void UpdateActiveFrameSource();
+
   scoped_ptr<BeginFrameSourceMultiplexer> frame_source_;
   BeginFrameSource* primary_frame_source_ = NULL;
   BeginFrameSource* background_frame_source_ = NULL;
 
   // Storage for when using internal frame sources.
   scoped_ptr<BeginFrameSource> primary_frame_source_internal_;
   scoped_ptr<SyntheticBeginFrameSource> background_frame_source_internal_;
 
  protected:
   Scheduler(SchedulerClient* client,
@@ skipping 63 matching lines @@
   }
 
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_