| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "app/surface/transport_dib.h" | 5 #include "app/surface/transport_dib.h" |
| 6 #include "base/shared_memory.h" | 6 #include "base/shared_memory.h" |
| 7 #include "base/sync_socket.h" | 7 #include "base/sync_socket.h" |
| 8 #include "native_client/src/trusted/desc/nacl_desc_base.h" | 8 #include "native_client/src/trusted/desc/nacl_desc_base.h" |
| 9 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h" | 9 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h" |
| 10 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 10 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 DescWrapper* DescWrapperFactory::ImportPepper2DSharedMemory(intptr_t shm_int) { | 26 DescWrapper* DescWrapperFactory::ImportPepper2DSharedMemory(intptr_t shm_int) { |
| 27 TransportDIB* dib = reinterpret_cast<TransportDIB*>(shm_int); | 27 TransportDIB* dib = reinterpret_cast<TransportDIB*>(shm_int); |
| 28 #if defined(OS_LINUX) | 28 #if defined(OS_LINUX) |
| 29 // TransportDIBs use SysV (X) shared memory on Linux. | 29 // TransportDIBs use SysV (X) shared memory on Linux. |
| 30 return ImportSysvShm(dib->handle(), dib->size()); | 30 return ImportSysvShm(dib->handle(), dib->size()); |
| 31 #elif defined(OS_MACOSX) | 31 #elif defined(OS_MACOSX) |
| 32 // TransportDIBs use mmap shared memory on OSX. | 32 // TransportDIBs use mmap shared memory on OSX. |
| 33 return ImportShmHandle(dib->handle().fd, dib->size()); | 33 return ImportShmHandle(dib->handle().fd, dib->size()); |
| 34 #elif defined(OS_WIN) | 34 #elif defined(OS_WIN) |
| 35 // TransportDIBs use MapViewOfFile shared memory on Windows. | 35 // TransportDIBs use MapViewOfFile shared memory on Windows. |
| 36 return ImportShmHandle(dib->handle(), dib->size()); | 36 return ImportShmHandle(dib->handle().section(), dib->size()); |
| 37 #else | 37 #else |
| 38 # error "What platform?" | 38 # error "What platform?" |
| 39 #endif | 39 #endif |
| 40 } | 40 } |
| 41 | 41 |
| 42 DescWrapper* DescWrapperFactory::ImportPepperSync(intptr_t sync_int) { | 42 DescWrapper* DescWrapperFactory::ImportPepperSync(intptr_t sync_int) { |
| 43 base::SyncSocket* sock = reinterpret_cast<base::SyncSocket*>(sync_int); | 43 base::SyncSocket* sock = reinterpret_cast<base::SyncSocket*>(sync_int); |
| 44 struct NaClDescSyncSocket* ss_desc = NULL; | 44 struct NaClDescSyncSocket* ss_desc = NULL; |
| 45 DescWrapper* wrapper = NULL; | 45 DescWrapper* wrapper = NULL; |
| 46 | 46 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 62 } | 62 } |
| 63 ss_desc = NULL; // DescWrapper takes ownership of ss_desc. | 63 ss_desc = NULL; // DescWrapper takes ownership of ss_desc. |
| 64 return wrapper; | 64 return wrapper; |
| 65 | 65 |
| 66 cleanup: | 66 cleanup: |
| 67 NaClDescSafeUnref(&ss_desc->base); | 67 NaClDescSafeUnref(&ss_desc->base); |
| 68 return NULL; | 68 return NULL; |
| 69 } | 69 } |
| 70 | 70 |
| 71 } // namespace nacl | 71 } // namespace nacl |
| OLD | NEW |