Index: components/html_viewer/web_layer_tree_view_impl.cc |
diff --git a/components/html_viewer/web_layer_tree_view_impl.cc b/components/html_viewer/web_layer_tree_view_impl.cc |
index f29252a40f4f6f611745f4b06d2f93c09614f03f..8f2237278d57c846c8afa3926e43a427b7b31f22 100644 |
--- a/components/html_viewer/web_layer_tree_view_impl.cc |
+++ b/components/html_viewer/web_layer_tree_view_impl.cc |
@@ -4,7 +4,7 @@ |
#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" |
@@ -24,7 +24,7 @@ WebLayerTreeViewImpl::WebLayerTreeViewImpl( |
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(); |
@@ -38,15 +38,16 @@ WebLayerTreeViewImpl::WebLayerTreeViewImpl( |
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
sadrul
2015/05/07 04:39:26
Fixed. (the default set of trybots didn't catch th
|
+ 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, ¶ms); |
DCHECK(layer_tree_host_); |
if (surface && gpu_service) { |