diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-25 10:44:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-25 09:40:07 +0000 |
| commit | e20ba3c57b50674f625b5088faa0fe9a076c0617 (patch) | |
| tree | 3006142b83866a52a56d34ade8446d5044647305 /chromium/base/process | |
| parent | 28b1110370900897ab652cb420c371fab8857ad4 (diff) | |
BASELINE: Update Chromium to 53.0.2785.80
Also adds 3rdparty libraries under pdfium.
Change-Id: I29afb23f1642fa55765d056697d5d145afa22bb2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/process')
| -rw-r--r-- | chromium/base/process/memory_linux.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chromium/base/process/memory_linux.cc b/chromium/base/process/memory_linux.cc index 9fb630b4750..985bc54eb64 100644 --- a/chromium/base/process/memory_linux.cc +++ b/chromium/base/process/memory_linux.cc @@ -27,7 +27,6 @@ size_t g_oom_size = 0U; namespace { -#if !defined(OS_ANDROID) void OnNoMemorySize(size_t size) { g_oom_size = size; @@ -39,7 +38,6 @@ void OnNoMemorySize(size_t size) { void OnNoMemory() { OnNoMemorySize(0); } -#endif // !defined(OS_ANDROID) } // namespace @@ -147,15 +145,10 @@ void EnableTerminationOnHeapCorruption() { } void EnableTerminationOnOutOfMemory() { -#if defined(OS_ANDROID) - // Android doesn't support setting a new handler. - DLOG(WARNING) << "Not feasible."; -#else // Set the new-out of memory handler. std::set_new_handler(&OnNoMemory); // If we're using glibc's allocator, the above functions will override // malloc and friends and make them die on out of memory. -#endif #if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) allocator::SetCallNewHandlerOnMallocFailure(true); |