From 9326ce8cfdfa8813aa20ea897d358da1ec5d3f1e Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Thu, 14 Sep 2017 12:51:39 +0300 Subject: [PATCH] allocator: rename use_experimental_allocator_shim to use_allocator_shim https://codereview.chromium.org/2902043007 --- atom/browser/mac/atom_application_delegate.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atom/browser/mac/atom_application_delegate.mm b/atom/browser/mac/atom_application_delegate.mm index 043448d49a48..9a5133368ef8 100644 --- a/atom/browser/mac/atom_application_delegate.mm +++ b/atom/browser/mac/atom_application_delegate.mm @@ -14,7 +14,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/values.h" -#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) +#if BUILDFLAG(USE_ALLOCATOR_SHIM) // On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer, // which would typically cause an OOM crash. To avoid this, the problematic // method is swizzled out and the make-OOM-fatal bit is disabled for the @@ -35,7 +35,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; base::allocator::SetCallNewHandlerOnMallocFailure(true); } @end -#endif // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) +#endif // BUILDFLAG(USE_ALLOCATOR_SHIM) @implementation AtomApplicationDelegate @@ -63,7 +63,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; atom::Browser::Get()->DidFinishLaunching(*empty_info); } -#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) +#if BUILDFLAG(USE_ALLOCATOR_SHIM) // Disable fatal OOM to hack around an OS bug https://crbug.com/654695. if (base::mac::IsOS10_12()) { g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(