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

Unified Diff: chrome/renderer/nacl_desc_wrapper_chrome.cc

Issue 8341052: share all the needed linux code with OpenBSD in chrome and content (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 2 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: chrome/renderer/nacl_desc_wrapper_chrome.cc
diff --git a/chrome/renderer/nacl_desc_wrapper_chrome.cc b/chrome/renderer/nacl_desc_wrapper_chrome.cc
index eb142993383181d62560d9199d17bc24d12de5ce..c29ae1d2558d9c648c227a9f0aad1daa8bfa3ff6 100644
--- a/chrome/renderer/nacl_desc_wrapper_chrome.cc
+++ b/chrome/renderer/nacl_desc_wrapper_chrome.cc
@@ -14,7 +14,7 @@ namespace nacl {
DescWrapper* DescWrapperFactory::ImportPepperSharedMemory(intptr_t shm_int,
size_t size) {
base::SharedMemory* shm = reinterpret_cast<base::SharedMemory*>(shm_int);
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_OPENBSD)
return ImportShmHandle(shm->handle().fd, size);
#elif defined(OS_WIN)
return ImportShmHandle(shm->handle(), size);
@@ -25,7 +25,7 @@ DescWrapper* DescWrapperFactory::ImportPepperSharedMemory(intptr_t shm_int,
DescWrapper* DescWrapperFactory::ImportPepper2DSharedMemory(intptr_t shm_int) {
TransportDIB* dib = reinterpret_cast<TransportDIB*>(shm_int);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
// TransportDIBs use SysV (X) shared memory on Linux.
return ImportSysvShm(dib->handle(), dib->size());
#elif defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698