diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2012-11-08 00:10:16 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2012-11-08 00:10:16 +0000 |
| commit | a89620b14e23bc9532b361715d0395b31c78787b (patch) | |
| tree | 3e331bf3857b2bf1da38dd857be82d0bf9419af7 /www/chromium/files/patch-chrome__browser__memory_details.cc | |
| parent | - forgot to remove a file in the last update. (diff) | |
Update to 23.0.1271.64
Submitted by: George Liaskos
Security: http://www.vuxml.org/freebsd/209c068d-28be-11e2-9160-00262d5ed8ee.html
Feature safe: yes
Diffstat (limited to 'www/chromium/files/patch-chrome__browser__memory_details.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome__browser__memory_details.cc | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc new file mode 100644 index 000000000000..1f6144d75f67 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__memory_details.cc @@ -0,0 +1,29 @@ +--- 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) { |