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 | |
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>
-rw-r--r-- | chromium/content/browser/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/content/renderer/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 9 | ||||
-rw-r--r-- | chromium/content/renderer/render_widget.cc | 4 | ||||
-rw-r--r-- | chromium/services/ui/clipboard/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/services/ui/public/cpp/BUILD.gn | 12 | ||||
-rw-r--r-- | chromium/ui/aura/BUILD.gn | 6 |
7 files changed, 35 insertions, 8 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index cf36d9aeaca..3034c261fdc 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -1984,7 +1984,7 @@ source_set("browser") { ] } - if (use_aura) { + if (use_aura && !use_qt) { deps += [ "//services/ui/public/cpp", "//services/ui/public/interfaces", @@ -1999,7 +1999,7 @@ source_set("browser") { "renderer_host/render_widget_host_view_event_handler.cc", "renderer_host/render_widget_host_view_event_handler.h", ] - } else { # Not aura. + } else if (!use_aura) { # Not aura. sources -= [ "renderer_host/input/synthetic_gesture_target_aura.cc", "renderer_host/input/synthetic_gesture_target_aura.h", diff --git a/chromium/content/renderer/BUILD.gn b/chromium/content/renderer/BUILD.gn index a71ae45e33e..7b3bc966875 100644 --- a/chromium/content/renderer/BUILD.gn +++ b/chromium/content/renderer/BUILD.gn @@ -507,7 +507,7 @@ target(link_target_type, "renderer") { ] allow_circular_includes_from = [] - if (use_aura) { + if (use_aura && !use_qt) { public_deps += [ "//content/renderer/mus" ] allow_circular_includes_from += [ "//content/renderer/mus" ] deps += [ "//services/ui/public/cpp" ] 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 diff --git a/chromium/content/renderer/render_widget.cc b/chromium/content/renderer/render_widget.cc index 6c5e6d5a3e7..e173d2183f3 100644 --- a/chromium/content/renderer/render_widget.cc +++ b/chromium/content/renderer/render_widget.cc @@ -395,7 +395,7 @@ RenderWidget::RenderWidget(int32_t widget_routing_id, ->NewRenderWidgetSchedulingState(); render_widget_scheduling_state_->SetHidden(is_hidden_); } -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) RendererWindowTreeClient::CreateIfNecessary(routing_id_); #endif } @@ -409,7 +409,7 @@ RenderWidget::~RenderWidget() { // If we are swapped out, we have released already. if (!is_swapped_out_ && RenderProcess::current()) RenderProcess::current()->ReleaseProcess(); -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(TOOLKIT_QT) // It is possible for a RenderWidget to be destroyed before it was embedded // in a mus window. The RendererWindowTreeClient will leak in such cases. So // explicitly delete it here. diff --git a/chromium/services/ui/clipboard/BUILD.gn b/chromium/services/ui/clipboard/BUILD.gn index 0eabe335094..75f4e7413d6 100644 --- a/chromium/services/ui/clipboard/BUILD.gn +++ b/chromium/services/ui/clipboard/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/features.gni") import("//services/catalog/public/tools/catalog.gni") import("//services/service_manager/public/cpp/service.gni") import("//services/service_manager/public/service_manifest.gni") @@ -42,6 +43,11 @@ source_set("tests") { ":lib", "//services/ui", ] + if (use_qt) { + data_deps -= [ + "//services/ui", + ] + } } service_manifest("unittest_manifest") { diff --git a/chromium/services/ui/public/cpp/BUILD.gn b/chromium/services/ui/public/cpp/BUILD.gn index 9875d3dbe6a..da25867ff9a 100644 --- a/chromium/services/ui/public/cpp/BUILD.gn +++ b/chromium/services/ui/public/cpp/BUILD.gn @@ -40,6 +40,12 @@ source_set("cpp") { "//services/ui", ] + if (use_qt) { + data_deps -= [ + "//services/ui", + ] + } + defines = [ "GL_GLEXT_PROTOTYPES" ] allow_circular_includes_from = [ ":internal" ] @@ -81,6 +87,12 @@ source_set("internal") { "//services/ui", ] + if (use_qt) { + data_deps -= [ + "//services/ui", + ] + } + defines = [ "GL_GLEXT_PROTOTYPES" ] if (use_ozone) { diff --git a/chromium/ui/aura/BUILD.gn b/chromium/ui/aura/BUILD.gn index e36d8c6a4f1..ded3cbb8339 100644 --- a/chromium/ui/aura/BUILD.gn +++ b/chromium/ui/aura/BUILD.gn @@ -186,6 +186,12 @@ component("aura") { "//services/ui", ] + if (use_qt) { + data_deps -= [ + "//services/ui", + ] + } + if (use_x11) { configs += [ "//build/config/linux:x11", |