cc: Make separate interface for BeginFrame ipc from OutputSurface

cc/trees/single_thread_proxy.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_TREES_SINGLE_THREAD_PROXY_H_
 #define CC_TREES_SINGLE_THREAD_PROXY_H_
 
 #include <limits>
 
 #include "base/cancelable_callback.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/scheduler.h"
 #include "cc/trees/blocking_task_runner.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/proxy.h"
 #include "cc/trees/proxy_timing_history.h"
 
 namespace cc {
 
+class BeginFrameSource;
 class ContextProvider;
 class LayerTreeHost;
 class LayerTreeHostSingleThreadClient;
 
 class CC_EXPORT SingleThreadProxy : public Proxy,
                                     NON_EXPORTED_BASE(LayerTreeHostImplClient),
                                     SchedulerClient {
  public:
   static scoped_ptr<Proxy> Create(
       LayerTreeHost* layer_tree_host,
       LayerTreeHostSingleThreadClient* client,
-      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+      scoped_ptr<BeginFrameSource> external_begin_frame_source);
   virtual ~SingleThreadProxy();
 
   // Proxy implementation
   virtual void FinishAllRendering() override;
   virtual bool IsStarted() const override;
   virtual void SetOutputSurface(scoped_ptr<OutputSurface>) override;
   virtual void SetLayerTreeHostClientReady() override;
   virtual void SetVisible(bool visible) override;
   virtual const RendererCapabilities& GetRendererCapabilities() const override;
   virtual void SetNeedsAnimate() override;
   virtual void SetNeedsUpdateLayers() override;
   virtual void SetNeedsCommit() override;
   virtual void SetNeedsRedraw(const gfx::Rect& damage_rect) override;
   virtual void SetNextCommitWaitsForActivation() override;
   virtual void NotifyInputThrottledUntilCommit() override {}
   virtual void SetDeferCommits(bool defer_commits) override;
   virtual bool CommitRequested() const override;
   virtual bool BeginMainFrameRequested() const override;
   virtual void MainThreadHasStoppedFlinging() override {}
   virtual void Start() override;
   virtual void Stop() override;
   virtual size_t MaxPartialTextureUpdates() const override;
   virtual void ForceSerializeOnSwapBuffers() override;
   virtual bool SupportsImplScrolling() const override;
   virtual void AsValueInto(base::debug::TracedValue* state) const override;
   virtual bool MainFrameWillHappenForTesting() override;
 
   // SchedulerClient implementation
-  virtual BeginFrameSource* ExternalBeginFrameSource() override;
   virtual void WillBeginImplFrame(const BeginFrameArgs& args) override;
   virtual void ScheduledActionSendBeginMainFrame() override;
   virtual DrawResult ScheduledActionDrawAndSwapIfPossible() override;
   virtual DrawResult ScheduledActionDrawAndSwapForced() override;
   virtual void ScheduledActionCommit() override;
   virtual void ScheduledActionAnimate() override;
   virtual void ScheduledActionUpdateVisibleTiles() override;
   virtual void ScheduledActionActivateSyncTree() override;
   virtual void ScheduledActionBeginOutputSurfaceCreation() override;
   virtual void ScheduledActionManageTiles() override;
@@ skipping 37 matching lines @@
 
   void RequestNewOutputSurface();
 
   // Called by the legacy path where RenderWidget does the scheduling.
   void CompositeImmediately(base::TimeTicks frame_begin_time);
 
  private:
   SingleThreadProxy(
       LayerTreeHost* layer_tree_host,
       LayerTreeHostSingleThreadClient* client,
-      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+      scoped_ptr<BeginFrameSource> external_begin_frame_source);
 
   void BeginMainFrame();
   void BeginMainFrameAbortedOnImplThread();
   void DoBeginMainFrame(const BeginFrameArgs& begin_frame_args);
   void DoCommit();
   DrawResult DoComposite(base::TimeTicks frame_begin_time,
                          LayerTreeHostImpl::FrameData* frame);
   void DoSwap();
   void DidCommitAndDrawFrame();
   void CommitComplete();
@@ skipping 24 matching lines @@
   bool commit_was_deferred_;
   bool commit_requested_;
 
   // True if a request to the LayerTreeHostClient to create an output surface
   // is still outstanding.
   bool output_surface_creation_requested_;
 
   // This is the callback for the scheduled RequestNewOutputSurface.
   base::CancelableClosure output_surface_creation_callback_;
 
+  scoped_ptr<BeginFrameSource> external_begin_frame_source_;
+
   base::WeakPtrFactory<SingleThreadProxy> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy);
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the impl thread to satisfy assertion checks.
 class DebugScopedSetImplThread {
  public:
   explicit DebugScopedSetImplThread(Proxy* proxy) : proxy_(proxy) {
@@ skipping 49 matching lines @@
  private:
   DebugScopedSetImplThread impl_thread_;
   DebugScopedSetMainThreadBlocked main_thread_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_SINGLE_THREAD_PROXY_H_