diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 02:35:46 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-03 02:35:46 +0000 |
| commit | f940e6806928bf9f53a670bdbf423c358d3cb2a0 (patch) | |
| tree | fb78f39cdf040b5b248540d9d568ff64a08e730a /base/process/memory_mac.mm | |
| parent | 100347913bd4cc00b33d116fcb6a298e565e468a (diff) | |
| download | chromium_src-f940e6806928bf9f53a670bdbf423c358d3cb2a0.zip chromium_src-f940e6806928bf9f53a670bdbf423c358d3cb2a0.tar.gz chromium_src-f940e6806928bf9f53a670bdbf423c358d3cb2a0.tar.bz2 | |
Update OOM killer to patch out CFAllocator on 10.9.
BUG=301757
TEST=none
NOTRY=true
Review URL: https://codereview.chromium.org/25288002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process/memory_mac.mm')
| -rw-r--r-- | base/process/memory_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/process/memory_mac.mm b/base/process/memory_mac.mm index 6fba300..9173a37 100644 --- a/base/process/memory_mac.mm +++ b/base/process/memory_mac.mm @@ -422,7 +422,7 @@ void oom_killer_new() { // === Core Foundation CFAllocators === bool CanGetContextForCFAllocator() { - return !base::mac::IsOSMavericksOrLater(); + return !base::mac::IsOSLaterThanMavericks_DontCallThis(); } CFAllocatorContext* ContextForCFAllocator(CFAllocatorRef allocator) { @@ -431,7 +431,9 @@ CFAllocatorContext* ContextForCFAllocator(CFAllocatorRef allocator) { const_cast<ChromeCFAllocatorLeopards*>( reinterpret_cast<const ChromeCFAllocatorLeopards*>(allocator)); return &our_allocator->_context; - } else if (base::mac::IsOSLion() || base::mac::IsOSMountainLion()) { + } else if (base::mac::IsOSLion() || + base::mac::IsOSMountainLion() || + base::mac::IsOSMavericks()) { ChromeCFAllocatorLions* our_allocator = const_cast<ChromeCFAllocatorLions*>( reinterpret_cast<const ChromeCFAllocatorLions*>(allocator)); |