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

Unified Diff: components/html_viewer/web_layer_tree_view_impl.cc

Issue 1126253005: cc: Add LayerTreeHost::InitParams for LayerTreeHost creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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: 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..94ddc55a7ed9a6718b39301be85482841dc9f18a 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;
+ params.gpu_memory_buffer_manager = gpu_memory_buffer_manager;
+ params.settings = &settings;
+ params.task_graph_runner = task_graph_runner;
+ params.main_task_runner = main_thread_compositor_task_runner_;
+
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) {
« no previous file with comments | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698