cc: Parameterize the main thread task runner

cc/trees/layer_tree_host.h

Index: cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index d53140e06a862375e56cc4a6e368c3eef5fbd3bd..71e1e531bd813e5853c756588adb3eea6d80c5ef 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -86,18 +86,22 @@ class CC_EXPORT LayerTreeHost {
       LayerTreeHostClient* client,
       SharedBitmapManager* manager,
       const LayerTreeSettings& settings,
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
 
   static scoped_ptr<LayerTreeHost> CreateSingleThreaded(
       LayerTreeHostClient* client,
       LayerTreeHostSingleThreadClient* single_thread_client,
       SharedBitmapManager* manager,
-      const LayerTreeSettings& settings);
+      const LayerTreeSettings& settings,
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
   virtual ~LayerTreeHost();
 
   void SetLayerTreeHostClientReady();
 
   // LayerTreeHost interface to Proxy.
+  void ScheduleBeginMainFrameOnImplThread(

[danakj, 2014/07/17 18:00:24]

This looks like it shouldn't be here?

[Sami, 2014/07/17 18:48:57]

Oops, missed that while breaking this down. Thanks!

+      const base::Closure& begin_main_frame_task);
   void WillBeginMainFrame() {
     client_->WillBeginMainFrame(source_frame_number_);
   }
@@ -302,9 +306,11 @@ class CC_EXPORT LayerTreeHost {
                 SharedBitmapManager* manager,
                 const LayerTreeSettings& settings);
   void InitializeThreaded(
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
   void InitializeSingleThreaded(
-      LayerTreeHostSingleThreadClient* single_thread_client);
+      LayerTreeHostSingleThreadClient* single_thread_client,
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
   void InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing);
   void SetOutputSurfaceLostForTesting(bool is_lost) {
     output_surface_lost_ = is_lost;