mirror of
https://git.freebsd.org/ports.git
synced 2025-07-07 12:29:16 -04:00
a89620b14e
Submitted by: George Liaskos Security: http://www.vuxml.org/freebsd/209c068d-28be-11e2-9160-00262d5ed8ee.html Feature safe: yes
29 lines
1.3 KiB
C++
29 lines
1.3 KiB
C++
--- chrome/browser/memory_details.cc.orig 2012-10-31 21:02:26.000000000 +0200
|
|
+++ chrome/browser/memory_details.cc 2012-11-07 17:28:28.000000000 +0200
|
|
@@ -31,7 +31,7 @@
|
|
#include "grit/generated_resources.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 "content/public/browser/zygote_host_linux.h"
|
|
#endif
|
|
|
|
@@ -195,7 +195,7 @@
|
|
void MemoryDetails::CollectChildInfoOnUIThread() {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
|
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
|
|
const pid_t sandbox_helper_pid =
|
|
content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
|
|
@@ -335,7 +335,7 @@
|
|
}
|
|
}
|
|
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
|
if (process.pid == zygote_pid) {
|
|
process.type = content::PROCESS_TYPE_ZYGOTE;
|
|
} else if (process.pid == sandbox_helper_pid) {
|