diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-19 15:14:25 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-19 15:17:15 +0100 |
| commit | eb846c24e504a3caad1c06b4a8cf466fd9c17334 (patch) | |
| tree | 47d6390fb754a4be270fd5b408391572143d77c6 /community/chromium/no-mallinfo.patch | |
| parent | 7f0d3977e95250d61c6056ed11409ba1bba4ca84 (diff) | |
| download | aports-eb846c24e504a3caad1c06b4a8cf466fd9c17334.tar.bz2 aports-eb846c24e504a3caad1c06b4a8cf466fd9c17334.tar.xz | |
community/chromium: upgrade to 55.0.2883.87
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 965cddb2eb..3ea66e475d 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -1,16 +1,16 @@ ---- a/base/trace_event/malloc_dump_provider.cc.orig 2016-05-08 08:04:01.166374018 +0200 -+++ b/base/trace_event/malloc_dump_provider.cc 2016-05-08 08:05:07.846264723 +0200 -@@ -61,7 +61,7 @@ bool MallocDumpProvider::OnMemoryDump(co - // fixed quantum, so the excess region will not be resident. - // See crrev.com/1531463004 for detailed explanation. - resident_size = stats.max_size_in_use; +--- base/trace_event/malloc_dump_provider.cc.orig 2016-11-16 02:19:56.753320143 +0100 ++++ base/trace_event/malloc_dump_provider.cc 2016-11-16 02:13:58.286196506 +0100 +@@ -224,7 +224,7 @@ + resident_size = all_heap_info.committed_size; + allocated_objects_size = all_heap_info.allocated_size; + allocated_objects_count = all_heap_info.block_count; -#else +#elif defined(OS_LINUX) && defined(__GLIBC__) struct mallinfo info = mallinfo(); DCHECK_GE(info.arena + info.hblkhd, info.uordblks); ---- a/content/child/content_child_helpers.cc.orig 2016-05-08 08:05:37.415219394 +0200 -+++ b/content/child/content_child_helpers.cc 2016-05-08 08:06:27.110142484 +0200 +--- content/child/content_child_helpers.cc.orig 2016-05-08 08:05:37.415219394 +0200 ++++ content/child/content_child_helpers.cc 2016-05-08 08:06:27.110142484 +0200 @@ -24,7 +24,7 @@ namespace content { // though, this provides only a partial and misleading value. // Unfortunately some telemetry benchmark rely on it and these need to |