summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-10-30 04:10:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-30 11:10:56 +0000
commit7fea23f2e3046a9bc23aed5522d22f7120414c74 (patch)
treeb9939c6e70cb086d888fedc9e5a5dba9f6fa1539 /base
parentb76c4015154cfc781408a0501a8476c3592198a2 (diff)
downloadchromium_src-7fea23f2e3046a9bc23aed5522d22f7120414c74.zip
chromium_src-7fea23f2e3046a9bc23aed5522d22f7120414c74.tar.gz
chromium_src-7fea23f2e3046a9bc23aed5522d22f7120414c74.tar.bz2
[iOS] Disable COUNT_RESIDENT_BYTES_SUPPORTED.
COUNT_RESIDENT_BYTES_SUPPORTED is disabled on iOS as it causes memory corruption on iOS 9.0+ devices. Note that this was only caught on bots downstream as we cannot run real device bots upstream. BUG=542671 Review URL: https://codereview.chromium.org/1425933002 Cr-Commit-Position: refs/heads/master@{#357079}
Diffstat (limited to 'base')
-rw-r--r--base/trace_event/process_memory_dump.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/trace_event/process_memory_dump.h b/base/trace_event/process_memory_dump.h
index 3ce9c43..a997c69 100644
--- a/base/trace_event/process_memory_dump.h
+++ b/base/trace_event/process_memory_dump.h
@@ -20,7 +20,9 @@
// Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
// resident memory.
-#if defined(OS_POSIX) && !defined(OS_NACL)
+// TODO(crbug.com/542671): COUNT_RESIDENT_BYTES_SUPPORTED is disabled on iOS
+// as it cause memory corruption on iOS 9.0+ devices.
+#if defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_IOS)
#define COUNT_RESIDENT_BYTES_SUPPORTED
#endif