mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allocator: rename use_experimental_allocator_shim to use_allocator_shim

Browse source 
https://codereview.chromium.org/2902043007
This commit is contained in:
Aleksei Kuzmin 2017-09-14 12:51:39 +03:00 committed by Cheng Zhao
parent 6d620c24b5
commit 9326ce8cfd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/mac/atom_application_delegate.mm
View file

@ -14,7 +14,7 @@
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "base/values.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, // 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 // 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 // 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); base::allocator::SetCallNewHandlerOnMallocFailure(true);
} }
@end @end
#endif // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) #endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
@implementation AtomApplicationDelegate @implementation AtomApplicationDelegate
@ -63,7 +63,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
atom::Browser::Get()->DidFinishLaunching(*empty_info); 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. // Disable fatal OOM to hack around an OS bug https://crbug.com/654695.
if (base::mac::IsOS10_12()) { if (base::mac::IsOS10_12()) {
g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler( g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(