diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 16:28:21 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:54 +0100 |
commit | e71d63f65ed84aeb869b369ee472b1dea2ec88f4 (patch) | |
tree | c446d34b48013021ef563db9f3471f3cc750204e | |
parent | 543d36d9c21d4e78a8409c46a7a002c651f0e6ce (diff) | |
download | qtwebengine-chromium-e71d63f65ed84aeb869b369ee472b1dea2ec88f4.tar.gz |
Do not bundle the tracing UI resources
We do not support loading the chrome://tracing WebUI and therefore
we shouldn't bundle those resources in our library.
Change-Id: If3aa4c676b22a55e772f19487e21b4cd48babe65
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r-- | chromium/chrome/chrome_paks.gni | 9 | ||||
-rw-r--r-- | chromium/content/browser/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/content/browser/webui/content_web_ui_controller_factory.cc | 4 | ||||
-rw-r--r-- | chromium/content/shell/BUILD.gn | 9 | ||||
-rw-r--r-- | chromium/headless/BUILD.gn | 9 |
5 files changed, 34 insertions, 3 deletions
diff --git a/chromium/chrome/chrome_paks.gni b/chromium/chrome/chrome_paks.gni index 8b3d1652ae2..bab3ea88e1e 100644 --- a/chromium/chrome/chrome_paks.gni +++ b/chromium/chrome/chrome_paks.gni @@ -149,6 +149,15 @@ template("chrome_extra_paks") { "//headless:resources", ] } + if (use_qt) { + sources -= [ + "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + ] + deps -= [ + "//content/browser/tracing:resources", + ] + } + if (is_chromeos) { sources += [ "$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak", diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index 5c323cd77f6..5aac49f25ee 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -1936,7 +1936,7 @@ jumbo_source_set("browser") { if (!is_mac) { deps += [ "//sandbox" ] } - if (!is_android) { + if (!is_android && !use_qt) { deps += [ "//components/vector_icons", "//content/browser/tracing:resources", @@ -2545,6 +2545,10 @@ jumbo_source_set("browser") { } if (use_qt) { + sources -= [ + "tracing/tracing_ui.cc", + "tracing/tracing_ui.h", + ] if (is_win) { sources -= [ "accessibility/browser_accessibility_com_win.cc", diff --git a/chromium/content/browser/webui/content_web_ui_controller_factory.cc b/chromium/content/browser/webui/content_web_ui_controller_factory.cc index 474e138da10..a228093c8b1 100644 --- a/chromium/content/browser/webui/content_web_ui_controller_factory.cc +++ b/chromium/content/browser/webui/content_web_ui_controller_factory.cc @@ -32,7 +32,7 @@ WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType( return WebUI::kNoWebUI; if (url.host_piece() == kChromeUIWebRTCInternalsHost || -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT) url.host_piece() == kChromeUITracingHost || #endif url.host_piece() == kChromeUIGpuHost || @@ -79,7 +79,7 @@ ContentWebUIControllerFactory::CreateWebUIControllerForURL( return std::make_unique<ServiceWorkerInternalsUI>(web_ui); if (url.host_piece() == kChromeUINetworkErrorsListingHost) return std::make_unique<NetworkErrorsListingUI>(web_ui); -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID)&& !defined(TOOLKIT_QT) if (url.host_piece() == kChromeUITracingHost) return std::make_unique<TracingUI>(web_ui); #endif diff --git a/chromium/content/shell/BUILD.gn b/chromium/content/shell/BUILD.gn index ea2d8125787..ad5a0bebe49 100644 --- a/chromium/content/shell/BUILD.gn +++ b/chromium/content/shell/BUILD.gn @@ -544,6 +544,15 @@ repack("pak") { "//ui/strings", ] + if (use_qt) { + sources -= [ + "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + ] + deps -= [ + "//content/browser/tracing:resources", + ] + } + if (toolkit_views) { deps += [ "//ui/views/resources" ] sources += diff --git a/chromium/headless/BUILD.gn b/chromium/headless/BUILD.gn index a3b300a0df8..49d240cfc7b 100644 --- a/chromium/headless/BUILD.gn +++ b/chromium/headless/BUILD.gn @@ -74,6 +74,15 @@ repack("pak") { "//ui/strings", ] + if (use_qt) { + sources -= [ + "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + ] + deps -= [ + "//content/browser/tracing:resources", + ] + } + output = "$root_out_dir/headless_lib.pak" } |