summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_memory__details.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2016-11-22 19:10:21 +0000
committerRene Ladan <rene@FreeBSD.org>2016-11-22 19:10:21 +0000
commit9187a6460fc419eec4dc64a4569e306722a83427 (patch)
treeb3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium/files/patch-chrome_browser_memory__details.cc
parentSome aarch64 servers apparently have ACPI. Attempt to build on aarch64 (diff)
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com> Reviewed by: cpm, rene Obtained from: https://github.com/paranormal/ MFH: 2016Q4 Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html Differential Revision: https://reviews.freebsd.org/D8517
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_memory__details.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_memory__details.cc10
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 0d020afce397..ac6264d1e57f 100644
--- a/www/chromium/files/patch-chrome_browser_memory__details.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@@ -1,6 +1,6 @@
---- chrome/browser/memory_details.cc.orig 2016-05-11 19:02:14 UTC
-+++ chrome/browser/memory_details.cc
-@@ -33,7 +33,7 @@
+--- chrome/browser/memory_details.cc.orig 2016-08-03 22:02:12.000000000 +0300
++++ chrome/browser/memory_details.cc 2016-09-30 22:07:01.106885000 +0300
+@@ -32,7 +32,7 @@
#include "content/public/common/content_constants.h"
#include "ui/base/l10n/l10n_util.h"
@@ -9,8 +9,8 @@
#include "content/public/browser/zygote_host_linux.h"
#endif
-@@ -365,7 +365,7 @@ void MemoryDetails::CollectChildInfoOnUI
- }
+@@ -334,7 +334,7 @@
+ process.titles.push_back(title);
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)