Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1096)

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1126253005: cc: Add LayerTreeHost::InitParams for LayerTreeHost creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: all Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index f635056d45a12960b0fcdc4f8fd6f794aabe5668..6f8e48da416f50fa12a427fa2568a264a2d61e2d 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -479,16 +479,19 @@ void RenderWidgetCompositor::Initialize() {
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
+ 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_);
}

Powered by Google App Engine
This is Rietveld 408576698