cc: Split Proxy and TaskRunnerProvider for the LayerTreeHost

cc/trees/threaded_channel.h

 // Copyright 2015 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_THREADED_CHANNEL_H_
 #define CC_TREES_THREADED_CHANNEL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ skipping 52 matching lines @@
 //                                                        SetLayerTreeClosed
 // ----------------------------------------------------------------------------
 
 class CC_EXPORT ThreadedChannel : public ChannelMain, public ChannelImpl {
  public:
   static scoped_ptr<ThreadedChannel> Create(
       // TODO(khushalsagar): Make this ProxyMain* and write the initialization
       // sequence. Currently ThreadProxy implements both so we pass the pointer
       // and set ProxyImpl.
       ThreadProxy* thread_proxy,
-      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
+      TaskRunnerProvider* task_runner_provider);
 
   ~ThreadedChannel() override;
 
   // ChannelMain Implementation
   void SetThrottleFrameProductionOnImpl(bool throttle) override;
   void UpdateTopControlsStateOnImpl(TopControlsState constraints,
                                     TopControlsState current,
                                     bool animate) override;
   void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface) override;
   void MainThreadHasStoppedFlingingOnImpl() override;
@@ skipping 33 matching lines @@
   void DidCompletePageScaleAnimation() override;
   void PostFrameTimingEventsOnMain(
       scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
       scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events)
       override;
   void BeginMainFrame(
       scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) override;
 
  protected:
   ThreadedChannel(ThreadProxy* thread_proxy,
-                  scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-                  scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
+                  TaskRunnerProvider* task_runner_provider);
 
  private:
   base::SingleThreadTaskRunner* MainThreadTaskRunner() const;
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() const;
 
   ProxyMain* proxy_main_;
 
   ProxyImpl* proxy_impl_;
 
-  // TODO(khushalsagar): Temporary variable to access proxy for assertion checks
-  // Remove this once the proxy class is split and the complete
-  // implementation for controlling communication across threads is moved to
-  // ThreadedChannel.
-  Proxy* proxy_;
+  TaskRunnerProvider* task_runner_provider_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadedChannel);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_THREADED_CHANNEL_H_