diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-03 17:29:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 16:01:56 +0200 |
| commit | aa56ff3328a74fb19aacc53d11967bc436fbc83f (patch) | |
| tree | 9a2ad9194fc9b73ad43058701683e7c002577409 /chromium/content/renderer/render_thread_impl.cc | |
| parent | 2384ae5a5b4f9bbf0db2d3ddb9f4a200829c2752 (diff) | |
| download | qtwebengine-chromium-aa56ff3328a74fb19aacc53d11967bc436fbc83f.tar.gz | |
Fix false dependency on mus, tracing and mojo_runner
We do not need these just because we use most of Aura.
Change-Id: I49f7894bcc6b18b8719ebf59927154730f9e54d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'chromium/content/renderer/render_thread_impl.cc')
| -rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index 02a6627cb64..eb907a4025a 100644 --- a/chromium/content/renderer/render_thread_impl.cc +++ b/chromium/content/renderer/render_thread_impl.cc @@ -197,9 +197,11 @@ #include "v8/src/third_party/vtune/v8-vtune.h" #endif +#if !defined(TOOLKIT_QT) #include "content/public/common/service_manager_connection.h" #include "content/renderer/mus/render_widget_window_tree_client_factory.h" #include "content/renderer/mus/renderer_window_tree_client.h" +#endif #include "services/ui/public/cpp/gpu/gpu.h" #if defined(ENABLE_IPC_FUZZER) @@ -622,12 +624,16 @@ void RenderThreadImpl::Init( // Register this object as the main thread. ChildProcess::current()->set_main_thread(this); +#if !defined(TOOLKIT_QT) if (IsRunningInMash()) { gpu_ = ui::Gpu::Create(GetServiceManagerConnection()->GetConnector(), GetIOTaskRunner()); } else { gpu_ = ui::Gpu::Create(GetRemoteInterfaces(), GetIOTaskRunner()); } +#else + gpu_ = ui::Gpu::Create(GetRemoteInterfaces(), GetIOTaskRunner()); +#endif channel()->GetThreadSafeRemoteAssociatedInterface( &thread_safe_render_message_filter_); @@ -701,7 +707,7 @@ void RenderThreadImpl::Init( AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) if (IsRunningInMash() && !base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kNoUseMusInRenderer)) { @@ -843,7 +849,7 @@ void RenderThreadImpl::Init( discardable_memory::mojom::DiscardableSharedMemoryManagerPtr manager_ptr; if (IsRunningInMash()) { -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) GetServiceManagerConnection()->GetConnector()->BindInterface( ui::mojom::kServiceName, &manager_ptr); #else @@ -1852,7 +1858,7 @@ RenderThreadImpl::CreateCompositorFrameSink( if (command_line.HasSwitch(switches::kDisableGpuCompositing)) use_software = true; -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) if (!use_software && IsRunningInMash() && !command_line.HasSwitch(switches::kNoUseMusInRenderer)) { return RendererWindowTreeClient::Get(routing_id) |