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

Side by Side Diff: components/nacl/loader/nacl_ipc_adapter.cc

Issue 1320783002: Make SharedMemoryHandle a class on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipc_global
Patch Set: Rebase. Created 5 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 unified diff | Download patch
OLDNEW
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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 for (Handles::const_iterator iter = handles.begin(); 538 for (Handles::const_iterator iter = handles.begin();
539 iter != handles.end(); 539 iter != handles.end();
540 ++iter) { 540 ++iter) {
541 scoped_ptr<NaClDescWrapper> nacl_desc; 541 scoped_ptr<NaClDescWrapper> nacl_desc;
542 switch (iter->type()) { 542 switch (iter->type()) {
543 case ppapi::proxy::SerializedHandle::SHARED_MEMORY: { 543 case ppapi::proxy::SerializedHandle::SHARED_MEMORY: {
544 const base::SharedMemoryHandle& shm_handle = iter->shmem(); 544 const base::SharedMemoryHandle& shm_handle = iter->shmem();
545 uint32_t size = iter->size(); 545 uint32_t size = iter->size();
546 nacl_desc.reset(new NaClDescWrapper(NaClDescImcShmMake( 546 nacl_desc.reset(new NaClDescWrapper(NaClDescImcShmMake(
547 #if defined(OS_WIN) 547 #if defined(OS_WIN)
548 shm_handle, 548 shm_handle.GetHandle(),
549 #else 549 #else
550 base::SharedMemory::GetFdFromSharedMemoryHandle(shm_handle), 550 base::SharedMemory::GetFdFromSharedMemoryHandle(shm_handle),
551 #endif 551 #endif
552 static_cast<size_t>(size)))); 552 static_cast<size_t>(size))));
553 break; 553 break;
554 } 554 }
555 case ppapi::proxy::SerializedHandle::SOCKET: { 555 case ppapi::proxy::SerializedHandle::SOCKET: {
556 nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake( 556 nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake(
557 #if defined(OS_WIN) 557 #if defined(OS_WIN)
558 iter->descriptor() 558 iter->descriptor()
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 header.flags = msg.flags(); 826 header.flags = msg.flags();
827 header.num_fds = static_cast<uint16>(rewritten_msg->desc_count()); 827 header.num_fds = static_cast<uint16>(rewritten_msg->desc_count());
828 828
829 rewritten_msg->SetData(header, msg.payload(), msg.payload_size()); 829 rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
830 locked_data_.to_be_received_.push(rewritten_msg); 830 locked_data_.to_be_received_.push(rewritten_msg);
831 } 831 }
832 832
833 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) { 833 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
834 return TranslatePepperFileReadWriteOpenFlags(pp_open_flags); 834 return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
835 } 835 }
OLDNEW
« no previous file with comments | « components/mus/gles2/command_buffer_driver.cc ('k') | components/printing/renderer/print_web_view_helper_pdf_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698