cc: Make separate interface for BeginFrame ipc from OutputSurface

cc/trees/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_THREAD_PROXY_H_
 #define CC_TREES_THREAD_PROXY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
 #include "cc/base/completion_event.h"
 #include "cc/base/delayed_unique_notifier.h"
 #include "cc/resources/resource_update_controller.h"
 #include "cc/scheduler/scheduler.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/proxy.h"
 #include "cc/trees/proxy_timing_history.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace cc {
 
+class BeginFrameSource;
 class ContextProvider;
 class InputHandlerClient;
 class LayerTreeHost;
 class ResourceUpdateQueue;
 class Scheduler;
 class ScopedThreadProxy;
 
 class CC_EXPORT ThreadProxy : public Proxy,
                     NON_EXPORTED_BASE(LayerTreeHostImplClient),
                     NON_EXPORTED_BASE(SchedulerClient),
                     NON_EXPORTED_BASE(ResourceUpdateControllerClient) {
  public:
   static scoped_ptr<Proxy> Create(
       LayerTreeHost* layer_tree_host,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
+      scoped_ptr<BeginFrameSource> external_begin_frame_source);
 
   virtual ~ThreadProxy();
 
   struct BeginMainFrameAndCommitState {
     BeginMainFrameAndCommitState();
     ~BeginMainFrameAndCommitState();
 
     unsigned int begin_frame_id;
     BeginFrameArgs begin_frame_args;
     scoped_ptr<ScrollAndScaleSet> scroll_info;
@@ skipping 149 matching lines @@
       override;
   virtual bool IsInsideDraw() override;
   virtual void RenewTreePriority() override;
   virtual void PostDelayedScrollbarFadeOnImplThread(
       const base::Closure& start_fade,
       base::TimeDelta delay) override;
   virtual void DidActivateSyncTree() override;
   virtual void DidManageTiles() 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 ScheduledActionAnimate() override;
   virtual void ScheduledActionCommit() override;
   virtual void ScheduledActionUpdateVisibleTiles() override;
   virtual void ScheduledActionActivateSyncTree() override;
   virtual void ScheduledActionBeginOutputSurfaceCreation() override;
   virtual void ScheduledActionManageTiles() override;
   virtual void DidAnticipatedDrawTimeChange(base::TimeTicks time) override;
   virtual base::TimeDelta DrawDurationEstimate() override;
   virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() override;
   virtual base::TimeDelta CommitToActivateDurationEstimate() override;
   virtual void DidBeginImplFrameDeadline() override;
 
   // ResourceUpdateControllerClient implementation
   virtual void ReadyToFinalizeTextureUpdates() override;
 
  protected:
-  ThreadProxy(LayerTreeHost* layer_tree_host,
-              scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-              scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
+  ThreadProxy(
+      LayerTreeHost* layer_tree_host,
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
+      scoped_ptr<BeginFrameSource> external_begin_frame_source);
 
  private:
   // Called on main thread.
   void SetRendererCapabilitiesMainThreadCopy(
       const RendererCapabilities& capabilities);
   void BeginMainFrame(
       scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
   void DidCommitAndDrawFrame();
   void DidCompleteSwapBuffers();
   void SetAnimationEvents(scoped_ptr<AnimationEventsVector> queue);
@@ skipping 44 matching lines @@
   MainThreadOrBlockedMainThread main_thread_or_blocked_vars_unsafe_;
   MainThreadOrBlockedMainThread& blocked_main();
 
   // Use accessors instead of this variable directly.
   CompositorThreadOnly compositor_thread_vars_unsafe_;
   CompositorThreadOnly& impl();
 
   base::WeakPtr<ThreadProxy> main_thread_weak_ptr_;
   base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_;
 
+  scoped_ptr<BeginFrameSource> external_begin_frame_source_;

[brianderson, 2014/10/18 00:08:45]

Should this go into the CompositorThreadOnly group?

[simonhong, 2014/10/23 01:03:08]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ThreadProxy);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_THREAD_PROXY_H_