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

Side by Side Diff: chrome/nacl/nacl_ipc_adapter.cc

Issue 11308082: ipc: Remove ipc_listener.h from ipc_channel.h and update the files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/nacl/nacl_ipc_adapter.h ('k') | content/renderer/gpu/stream_texture_host_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/nacl/nacl_ipc_adapter.h" 5 #include "chrome/nacl/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"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/shared_memory.h" 14 #include "base/shared_memory.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "ipc/ipc_channel.h"
16 #include "ipc/ipc_message_macros.h" 17 #include "ipc/ipc_message_macros.h"
17 #include "ipc/ipc_platform_file.h" 18 #include "ipc/ipc_platform_file.h"
18 #include "native_client/src/trusted/desc/nacl_desc_custom.h" 19 #include "native_client/src/trusted/desc/nacl_desc_custom.h"
19 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" 20 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
20 #include "ppapi/proxy/ppapi_messages.h" 21 #include "ppapi/proxy/ppapi_messages.h"
21 22
22 namespace { 23 namespace {
23 24
24 enum BufferSizeStatus { 25 enum BufferSizeStatus {
25 // The buffer contains a full message with no extra bytes. 26 // The buffer contains a full message with no extra bytes.
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 header.payload_size = static_cast<uint32>(msg.payload_size()); 679 header.payload_size = static_cast<uint32>(msg.payload_size());
679 header.routing = msg.routing_id(); 680 header.routing = msg.routing_id();
680 header.type = msg.type(); 681 header.type = msg.type();
681 header.flags = msg.flags(); 682 header.flags = msg.flags();
682 header.num_fds = static_cast<int>(rewritten_msg->desc_count()); 683 header.num_fds = static_cast<int>(rewritten_msg->desc_count());
683 684
684 rewritten_msg->SetData(header, msg.payload(), msg.payload_size()); 685 rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
685 locked_data_.to_be_received_.push(rewritten_msg); 686 locked_data_.to_be_received_.push(rewritten_msg);
686 } 687 }
687 688
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_ipc_adapter.h ('k') | content/renderer/gpu/stream_texture_host_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698