cc: Add LayerTreeHost::InitParams for LayerTreeHost creation.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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.
 
 #include "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 461 matching lines @@
       compositor_deps_->GetGpuMemoryBufferManager();
   cc::TaskGraphRunner* task_graph_runner =
       compositor_deps_->GetTaskGraphRunner();
 
   scoped_ptr<cc::BeginFrameSource> external_begin_frame_source;
   if (settings.use_external_begin_frame_source) {
     external_begin_frame_source =
         compositor_deps_->CreateExternalBeginFrameSource(widget_->routing_id());
   }
 
+  cc::LayerTreeHost::InitParams params;
+  params.client = this;
+  params.shared_bitmap_manager = shared_bitmap_manager;
+  params.gpu_memory_buffer_manager = gpu_memory_buffer_manager;
+  params.task_graph_runner = task_graph_runner;

[danakj, 2015/05/07 00:59:56]

no settings here either

[sadrul, 2015/05/07 04:39:26]

Fixed (thankfully, lots of try failures from this omission).

+  params.main_task_runner = main_thread_compositor_task_runner;
+  params.external_begin_frame_source = external_begin_frame_source.Pass();
+
   if (compositor_thread_task_runner.get()) {
     layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
-        this, shared_bitmap_manager, gpu_memory_buffer_manager,
-        task_graph_runner, settings, main_thread_compositor_task_runner,
-        compositor_thread_task_runner, external_begin_frame_source.Pass());
+        compositor_thread_task_runner, &params);
   } else {
-    layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
-        this, this, shared_bitmap_manager, gpu_memory_buffer_manager,
-        task_graph_runner, settings, main_thread_compositor_task_runner,
-        external_begin_frame_source.Pass());
+    layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(this, &params);
   }
   DCHECK(layer_tree_host_);
 }
 
 RenderWidgetCompositor::~RenderWidgetCompositor() {}
 
 const base::WeakPtr<cc::InputHandler>&
 RenderWidgetCompositor::GetInputHandler() {
   return layer_tree_host_->GetInputHandler();
 }
@@ skipping 438 matching lines @@
   cc::ContextProvider* provider =
       compositor_deps_->GetSharedMainThreadContextProvider();
   // provider can be NULL after the GPU process crashed enough times and we
   // don't want to restart it any more (falling back to software).
   if (!provider)
     return;
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content