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

Unified Diff: components/nacl/loader/nacl_ipc_adapter.cc

Issue 1890023002: Revert of mac: Remove POSIX shared memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp50_base
Patch Set: 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: components/nacl/loader/nacl_ipc_adapter.cc
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
index d8bdb0862232086d428136fbf73d3d2e8be87b63..fbd88423505863264db77ebac9ba4c71cba0d85e 100644
--- a/components/nacl/loader/nacl_ipc_adapter.cc
+++ b/components/nacl/loader/nacl_ipc_adapter.cc
@@ -233,9 +233,13 @@
const base::SharedMemoryHandle& handle,
size_t size) {
#if defined(OS_MACOSX)
- return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(
- NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
-#else
+ if (handle.GetType() == base::SharedMemoryHandle::MACH) {
+ return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(
+ NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
+ }
+ CHECK_EQ(base::SharedMemoryHandle::POSIX, handle.GetType());
+#endif
+
return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(NaClDescImcShmMake(
#if defined(OS_WIN)
handle.GetHandle(),
@@ -243,7 +247,6 @@
base::SharedMemory::GetFdFromSharedMemoryHandle(handle),
#endif
size)));
-#endif
}
} // namespace
« no previous file with comments | « base/memory/shared_memory_unittest.cc ('k') | content/renderer/media/video_capture_message_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698