diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-29 16:16:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 10:04:06 +0000 |
| commit | a95a7417ad456115a1ef2da4bb8320531c0821f1 (patch) | |
| tree | edcd59279e486d2fd4a8f88a7ed025bcf925c6e6 /chromium/content/zygote | |
| parent | 33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (diff) | |
| download | qtwebengine-chromium-a95a7417ad456115a1ef2da4bb8320531c0821f1.tar.gz | |
BASELINE: Update Chromium to 106.0.5249.126
Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/zygote')
| -rw-r--r-- | chromium/content/zygote/BUILD.gn | 1 | ||||
| -rw-r--r-- | chromium/content/zygote/zygote_linux.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/zygote/BUILD.gn b/chromium/content/zygote/BUILD.gn index 27381b9a009..3cdfbea0890 100644 --- a/chromium/content/zygote/BUILD.gn +++ b/chromium/content/zygote/BUILD.gn @@ -18,6 +18,7 @@ if (is_linux || is_chromeos) { "//base", "//base:i18n", "//build:chromeos_buildflags", + "//content/common:sandbox_support_linux", "//content/public/common:common_sources", "//ipc", "//sandbox", diff --git a/chromium/content/zygote/zygote_linux.cc b/chromium/content/zygote/zygote_linux.cc index 9badc3a5fba..8febe36a892 100644 --- a/chromium/content/zygote/zygote_linux.cc +++ b/chromium/content/zygote/zygote_linux.cc @@ -462,8 +462,7 @@ int Zygote::ForkWithRealPid(const std::string& process_type, IPC::Channel::SetGlobalPid(real_pid); // Force the real PID so chrome event data have a PID that corresponds // to system trace event data. - base::trace_event::TraceLog::GetInstance()->SetProcessID( - static_cast<int>(real_pid)); + base::trace_event::TraceLog::GetInstance()->SetProcessID(real_pid); #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) // Tell Perfetto SDK about the real PID too. perfetto::Platform::SetCurrentProcessId(real_pid); |