Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1088)

Unified Diff: mojo/edk/embedder/platform_shared_buffer.cc

Issue 1897623002: Remove POSIX shared memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase against https://codereview.chromium.org/1890043002/. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/embedder/platform_shared_buffer.cc
diff --git a/mojo/edk/embedder/platform_shared_buffer.cc b/mojo/edk/embedder/platform_shared_buffer.cc
index 63e5676a0455b7689a8ddcc26b3f3bb29e3c874f..a3537392d9a9e28648e5d25f509cf32266bd0a33 100644
--- a/mojo/edk/embedder/platform_shared_buffer.cc
+++ b/mojo/edk/embedder/platform_shared_buffer.cc
@@ -27,14 +27,7 @@ ScopedPlatformHandle SharedMemoryToPlatformHandle(
#elif defined(OS_WIN)
return ScopedPlatformHandle(PlatformHandle(memory_handle.GetHandle()));
#else
- if (memory_handle.GetType() == base::SharedMemoryHandle::MACH) {
- return ScopedPlatformHandle(PlatformHandle(
- memory_handle.GetMemoryObject()));
- } else {
- DCHECK(memory_handle.GetType() == base::SharedMemoryHandle::POSIX);
- return ScopedPlatformHandle(PlatformHandle(
- memory_handle.GetFileDescriptor().fd));
- }
+ return ScopedPlatformHandle(PlatformHandle(memory_handle.GetMemoryObject()));
#endif
}
@@ -227,9 +220,6 @@ bool PlatformSharedBuffer::Init() {
options.size = num_bytes_;
// By default, we can share as read-only.
options.share_read_only = true;
-#if defined(OS_MACOSX) && !defined(OS_IOS)
- options.type = base::SharedMemoryHandle::MACH;
-#endif
shared_memory_.reset(new base::SharedMemory);
return shared_memory_->Create(options);
@@ -244,12 +234,8 @@ bool PlatformSharedBuffer::InitFromPlatformHandle(
base::GetCurrentProcId());
#elif defined(OS_MACOSX) && !defined(OS_IOS)
base::SharedMemoryHandle handle;
- if (platform_handle.get().type == PlatformHandle::Type::MACH) {
- handle = base::SharedMemoryHandle(
- platform_handle.release().port, num_bytes_, base::GetCurrentProcId());
- } else {
- handle = base::SharedMemoryHandle(platform_handle.release().handle, false);
- }
+ handle = base::SharedMemoryHandle(platform_handle.release().port, num_bytes_,
+ base::GetCurrentProcId());
#else
base::SharedMemoryHandle handle(platform_handle.release().handle, false);
#endif

Powered by Google App Engine
This is Rietveld 408576698