OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/nacl/loader/nacl_ipc_adapter.h" | 5 #include "components/nacl/loader/nacl_ipc_adapter.h" |
6 | 6 |
7 #include <limits.h> | 7 #include <limits.h> |
8 #include <string.h> | 8 #include <string.h> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
544 ++iter) { | 544 ++iter) { |
545 scoped_ptr<NaClDescWrapper> nacl_desc; | 545 scoped_ptr<NaClDescWrapper> nacl_desc; |
546 switch (iter->type()) { | 546 switch (iter->type()) { |
547 case ppapi::proxy::SerializedHandle::SHARED_MEMORY: { | 547 case ppapi::proxy::SerializedHandle::SHARED_MEMORY: { |
548 const base::SharedMemoryHandle& shm_handle = iter->shmem(); | 548 const base::SharedMemoryHandle& shm_handle = iter->shmem(); |
549 uint32_t size = iter->size(); | 549 uint32_t size = iter->size(); |
550 nacl_desc.reset(new NaClDescWrapper(NaClDescImcShmMake( | 550 nacl_desc.reset(new NaClDescWrapper(NaClDescImcShmMake( |
551 #if defined(OS_WIN) | 551 #if defined(OS_WIN) |
552 shm_handle, | 552 shm_handle, |
553 #else | 553 #else |
554 shm_handle.fd, | 554 base::SharedMemory::GetFdFromSharedMemoryHandle(shm_handle), |
555 #endif | 555 #endif |
556 static_cast<size_t>(size)))); | 556 static_cast<size_t>(size)))); |
557 break; | 557 break; |
558 } | 558 } |
559 case ppapi::proxy::SerializedHandle::SOCKET: { | 559 case ppapi::proxy::SerializedHandle::SOCKET: { |
560 nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake( | 560 nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake( |
561 #if defined(OS_WIN) | 561 #if defined(OS_WIN) |
562 iter->descriptor() | 562 iter->descriptor() |
563 #else | 563 #else |
564 iter->descriptor().fd | 564 iter->descriptor().fd |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
830 header.flags = msg.flags(); | 830 header.flags = msg.flags(); |
831 header.num_fds = static_cast<uint16>(rewritten_msg->desc_count()); | 831 header.num_fds = static_cast<uint16>(rewritten_msg->desc_count()); |
832 | 832 |
833 rewritten_msg->SetData(header, msg.payload(), msg.payload_size()); | 833 rewritten_msg->SetData(header, msg.payload(), msg.payload_size()); |
834 locked_data_.to_be_received_.push(rewritten_msg); | 834 locked_data_.to_be_received_.push(rewritten_msg); |
835 } | 835 } |
836 | 836 |
837 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) { | 837 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) { |
838 return TranslatePepperFileReadWriteOpenFlags(pp_open_flags); | 838 return TranslatePepperFileReadWriteOpenFlags(pp_open_flags); |
839 } | 839 } |
OLD | NEW |