diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 22:35:22 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 22:35:22 +0000 |
| commit | 1388ccffaf0ca5aa7783c9f267c0d2df2f17b0e5 (patch) | |
| tree | 931b1f4889c29020426c459d7da9ea56639293b0 /third_party/apple_apsl | |
| parent | 73159d6d12b09405ca23fcc801e957104c85f74d (diff) | |
| download | chromium_src-1388ccffaf0ca5aa7783c9f267c0d2df2f17b0e5.zip chromium_src-1388ccffaf0ca5aa7783c9f267c0d2df2f17b0e5.tar.gz chromium_src-1388ccffaf0ca5aa7783c9f267c0d2df2f17b0e5.tar.bz2 | |
Add preliminary OOM support for Mountain Lion.
BUG=117476
TEST=run base_unittests on Mountain Lion
Review URL: http://codereview.chromium.org/9701031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/apple_apsl')
| -rw-r--r-- | third_party/apple_apsl/CFBase.h | 3 | ||||
| -rw-r--r-- | third_party/apple_apsl/README.chromium | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/apple_apsl/CFBase.h b/third_party/apple_apsl/CFBase.h index f7ecaf6..557007c 100644 --- a/third_party/apple_apsl/CFBase.h +++ b/third_party/apple_apsl/CFBase.h @@ -50,7 +50,8 @@ struct ChromeCFAllocatorLeopards { CFAllocatorContext _context; }; -struct ChromeCFAllocatorLion { +// TODO(avi): verify that this is accurate for 10.8 upon source release; http://crbug.com/117476 +struct ChromeCFAllocatorLions { ChromeCFRuntimeBase _base; #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */ diff --git a/third_party/apple_apsl/README.chromium b/third_party/apple_apsl/README.chromium index 424d77c..76b1a96 100644 --- a/third_party/apple_apsl/README.chromium +++ b/third_party/apple_apsl/README.chromium @@ -32,7 +32,7 @@ Modifications: - Removed everything but the definition of __CFAllocator. - Modified the reference of CFRuntimeBase to ChromeCFRuntimeBase. - Renamed __CFAllocator to ChromeCFAllocatorLeopards (from CF-550) and to - ChromeCFAllocatorLion (from CF-635) to avoid possible name conflicts. + ChromeCFAllocatorLions (from CF-635) to avoid possible name conflicts. cssmapplePriv.h from: http://www.opensource.apple.com/source/libsecurity_cssm/libsecurity_cssm-31536/lib/cssmapplePriv.h |