diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-03 17:29:13 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-08-01 08:50:54 +0000 |
| commit | 6a1157ca8f0f652e38ed49bd31d76f047937e239 (patch) | |
| tree | c99c70aa9ca74813f7e8382088eda9965e497a24 /chromium/content/renderer/render_thread_impl.cc | |
| parent | 92a2802dba2dd26b88f1594f6c14a091693f33b3 (diff) | |
| download | qtwebengine-chromium-6a1157ca8f0f652e38ed49bd31d76f047937e239.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>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/renderer/render_thread_impl.cc')
| -rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index d7a0de4e48c..302412c0774 100644 --- a/chromium/content/renderer/render_thread_impl.cc +++ b/chromium/content/renderer/render_thread_impl.cc @@ -209,9 +209,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) @@ -659,6 +661,7 @@ void RenderThreadImpl::Init( base::BindRepeating(&CreateSingleSampleMetricsProvider, message_loop()->task_runner(), GetConnector())); + // QTFIXME! gpu_ = ui::Gpu::Create( GetConnector(), IsRunningInMash() ? ui::mojom::kServiceName : mojom::kBrowserServiceName, @@ -736,7 +739,7 @@ void RenderThreadImpl::Init( AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) if (IsRunningInMash()) { CreateRenderWidgetWindowTreeClientFactory(GetServiceManagerConnection()); } @@ -886,7 +889,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 @@ -1898,7 +1901,7 @@ void RenderThreadImpl::RequestNewCompositorFrameSink( synthetic_begin_frame_source = CreateSyntheticBeginFrameSource(); } -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) if (!use_software && IsRunningInMash()) { scoped_refptr<gpu::GpuChannelHost> channel = EstablishGpuChannelSync(); // If the channel could not be established correctly, then return null. This |