diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-09 13:36:10 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-09 13:36:43 +0200 |
| commit | 4358dca0f77dcc6bd073e6f1e55e5c59c89e6c1b (patch) | |
| tree | af2034ce508ba4bf4e4daab19f5e65798f46dc27 /community/chromium/no-mallinfo.patch | |
| parent | 117de5a063091790a09ecbfc08cb4ae97b25a869 (diff) | |
| download | aports-4358dca0f77dcc6bd073e6f1e55e5c59c89e6c1b.tar.bz2 aports-4358dca0f77dcc6bd073e6f1e55e5c59c89e6c1b.tar.xz | |
community/chromium: upgrade to 59.0.3071.86
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 306c64b622..4396e29778 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -22,9 +22,9 @@ uint64_t mem_usage = --- content/renderer/render_thread_impl.cc.orig +++ content/renderer/render_thread_impl.cc -@@ -1712,6 +1712,49 @@ +@@ -1699,6 +1699,49 @@ } - + } // namespace +#elif defined(OS_LINUX) && !defined(__GLIBC__) +namespace { @@ -70,14 +70,14 @@ + +} // namespace #endif - - void RenderThreadImpl::GetRendererMemoryMetrics( -@@ -1722,7 +1765,7 @@ - memory_metrics->partition_alloc_kb = - blink_stats.partitionAllocTotalAllocatedBytes / 1024; - memory_metrics->blink_gc_kb = blink_stats.blinkGCTotalAllocatedBytes / 1024; + + bool RenderThreadImpl::GetRendererMemoryMetrics( +@@ -1719,7 +1762,7 @@ + blink_stats.partition_alloc_total_allocated_bytes / 1024; + memory_metrics->blink_gc_kb = + blink_stats.blink_gc_total_allocated_bytes / 1024; -#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID) ++#if defined(OS_LINUX) && defined(__GLIBC__) || defined(OS_ANDROID) struct mallinfo minfo = mallinfo(); #if defined(USE_TCMALLOC) size_t malloc_usage = minfo.uordblks; |