diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
| commit | 40c48efc97e1692154f38e01ef1739bbef1e4728 (patch) | |
| tree | 80245efab86b6f22f00a53b43568f0fd51edfb14 /www/chromium/files/patch-chrome_browser_memory__details.cc | |
| parent | deskutils/ultralist: Update to 1.6.1 (diff) | |
www/chromium: Update to version 85.0.4183.121
Submitted by: cem, rene
Obtained from: some patches from OpenBSD port
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_memory__details.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_memory__details.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index d482b53d7d5e..4e26809d804c 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,20 +1,20 @@ ---- chrome/browser/memory_details.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/memory_details.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/memory_details.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #include "services/service_manager/zygote/zygote_host_linux.h" + #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -340,7 +340,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -339,7 +339,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (service_manager::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { + if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } |