| 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
|
|
|