Differential D23984 Diff 69253 www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
| --- base/memory/platform_shared_memory_region_posix.cc.orig 2019-09-16 12:05:39 UTC | --- base/memory/platform_shared_memory_region_posix.cc.orig 2020-03-03 18:52:59 UTC | ||||
| +++ base/memory/platform_shared_memory_region_posix.cc | +++ base/memory/platform_shared_memory_region_posix.cc | ||||
| @@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const { | @@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const { | ||||
| return {fd.get(), readonly_fd.get()}; | return {fd.get(), readonly_fd.get()}; | ||||
| } | } | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| // static | // static | ||||
| ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { | ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { | ||||
| PlatformSharedMemoryRegion region = | PlatformSharedMemoryRegion region = | ||||
| @@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: | @@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: | ||||
| return region.PassPlatformHandle().fd; | return region.PassPlatformHandle().fd; | ||||
| return ScopedFD(); | return ScopedFD(); | ||||
| } | } | ||||
| -#endif // defined(OS_LINUX) | -#endif // defined(OS_LINUX) | ||||
| +#endif // defined(OS_LINUX) || defined(OS_BSD) | +#endif // defined(OS_LINUX) || defined(OS_BSD) | ||||
| // static | // static | ||||
| PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( | PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( | ||||
| @@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o | @@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o | ||||
| // static | // static | ||||
| PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, | PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, | ||||
| size_t size | size_t size | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| , | , | ||||
| bool executable | bool executable | ||||
| #endif | #endif | ||||
| @@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: | @@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: | ||||
| // flag. | // flag. | ||||
| FilePath directory; | FilePath directory; | ||||
| if (!GetShmemTempDir( | if (!GetShmemTempDir( | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| executable, | executable, | ||||
| #else | #else | ||||
| false /* executable */, | false /* executable */, | ||||