cc: Add LayerTreeHost::InitParams for LayerTreeHost creation.

components/html_viewer/web_layer_tree_view_impl.cc

 // Copyright 2014 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 "components/html_viewer/web_layer_tree_view_impl.h"
 
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/thread_task_runner_handle.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/trees/layer_tree_host.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "mojo/cc/context_provider_mojo.h"
 #include "mojo/cc/output_surface_mojo.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 
 namespace html_viewer {
 
 WebLayerTreeViewImpl::WebLayerTreeViewImpl(
     scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy,
     mojo::SurfacePtr surface,
     mojo::GpuPtr gpu_service)
     : widget_(NULL),
       view_(NULL),
-      main_thread_compositor_task_runner_(base::MessageLoopProxy::current()),
+      main_thread_compositor_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       weak_factory_(this) {
   main_thread_bound_weak_ptr_ = weak_factory_.GetWeakPtr();
 
   cc::LayerTreeSettings settings;
 
   // For web contents, layer transforms should scale up the contents of layers
   // to keep content always crisp when possible.
   settings.layer_transforms_should_scale_layer_contents = true;
 
   cc::SharedBitmapManager* shared_bitmap_manager = nullptr;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = nullptr;
   cc::TaskGraphRunner* task_graph_runner = nullptr;
 
+  cc::LayerTreeHost::InitParams params;
+  params.client = this;
+  params.shared_bitmap_manager = shared_bitmap_manager;

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

you're not using the settings here, can you double check the other places?

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

Fixed. (the default set of trybots didn't catch this :( There are some bots on
tryserver.client.mojo master though, I have triggered them to make sure this is
caught)

+  params.gpu_memory_buffer_manager = gpu_memory_buffer_manager;
+  params.task_graph_runner = task_graph_runner;
+  params.main_task_runner = main_thread_compositor_task_runner_;
+  params.external_begin_frame_source = external_begin_frame_source.Pass();
+
   layer_tree_host_ =
-      cc::LayerTreeHost::CreateThreaded(this,
-                                        shared_bitmap_manager,
-                                        gpu_memory_buffer_manager,
-                                        task_graph_runner,
-                                        settings,
-                                        base::MessageLoopProxy::current(),
-                                        compositor_message_loop_proxy,
-                                        nullptr);
+      cc::LayerTreeHost::CreateThreaded(compositor_message_loop_proxy, &params);
   DCHECK(layer_tree_host_);
 
   if (surface && gpu_service) {
     mojo::CommandBufferPtr cb;
     gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb));
     scoped_refptr<cc::ContextProvider> context_provider(
         new mojo::ContextProviderMojo(cb.PassMessagePipe()));
     output_surface_.reset(
         new mojo::OutputSurfaceMojo(this, context_provider, surface.Pass()));
   }
@@ skipping 185 matching lines @@
       base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
                  main_thread_bound_weak_ptr_,
                  id));
 }
 
 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
   view_->SetSurfaceId(mojo::SurfaceId::From(id));
 }
 
 }  // namespace html_viewer