| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 3b17ea0d15a56e5544b8bd2492366bfa42f917d4..f6c681c1e46646052e69a52c633d68cebe411fd1 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -39,7 +39,9 @@
|
| #include "cc/blink/web_layer_impl.h"
|
| #include "cc/layers/layer_settings.h"
|
| #include "cc/raster/task_graph_runner.h"
|
| +#include "cc/trees/layer_tree_host_common.h"
|
| #include "cc/trees/layer_tree_settings.h"
|
| +#include "components/scheduler/child/webthread_base.h"
|
| #include "components/scheduler/renderer/renderer_scheduler.h"
|
| #include "content/child/appcache/appcache_dispatcher.h"
|
| #include "content/child/appcache/appcache_frontend_impl.h"
|
| @@ -1086,14 +1088,11 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
|
| sync_compositor_factory->GetCompositorTaskRunner();
|
| }
|
| #endif
|
| - if (!compositor_task_runner_) {
|
| - compositor_thread_.reset(new base::Thread("Compositor"));
|
| - base::Thread::Options compositor_thread_options;
|
| -#if defined(OS_ANDROID)
|
| - compositor_thread_options.priority = base::ThreadPriority::DISPLAY;
|
| -#endif
|
| - compositor_thread_->StartWithOptions(compositor_thread_options);
|
| - compositor_task_runner_ = compositor_thread_->task_runner();
|
| + if (!compositor_task_runner_.get()) {
|
| + compositor_thread_.reset(
|
| + blink_platform_impl_->createThreadForCompositor("Compositor"));
|
| + compositor_task_runner_ = static_cast<scheduler::WebThreadBase*>(
|
| + compositor_thread_.get())->TaskRunner();
|
| compositor_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(base::IgnoreResult(&ThreadRestrictions::SetIOAllowed),
|
|
|