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

Side by Side Diff: ipc/ipc_channel_proxy.cc

Issue 659243002: Non-SFI Mode: Build ipc/ library by PNaCl toolchain for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 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
« no previous file with comments | « ipc/ipc_channel_proxy.h ('k') | ipc/ipc_nacl.gyp » ('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 "ipc/ipc_channel_proxy.h" 5 #include "ipc/ipc_channel_proxy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 FROM_HERE, base::Bind(&Context::OnRemoveFilter, context_.get(), 427 FROM_HERE, base::Bind(&Context::OnRemoveFilter, context_.get(),
428 make_scoped_refptr(filter))); 428 make_scoped_refptr(filter)));
429 } 429 }
430 430
431 void ChannelProxy::ClearIPCTaskRunner() { 431 void ChannelProxy::ClearIPCTaskRunner() {
432 DCHECK(CalledOnValidThread()); 432 DCHECK(CalledOnValidThread());
433 433
434 context()->ClearIPCTaskRunner(); 434 context()->ClearIPCTaskRunner();
435 } 435 }
436 436
437 #if defined(OS_POSIX) && !defined(OS_NACL) 437 #if defined(OS_POSIX) && \
438 (!defined(OS_NACL) || defined(__native_client_nonsfi__))
438 // See the TODO regarding lazy initialization of the channel in 439 // See the TODO regarding lazy initialization of the channel in
439 // ChannelProxy::Init(). 440 // ChannelProxy::Init().
440 int ChannelProxy::GetClientFileDescriptor() { 441 int ChannelProxy::GetClientFileDescriptor() {
441 DCHECK(CalledOnValidThread()); 442 DCHECK(CalledOnValidThread());
442 443
443 Channel* channel = context_.get()->channel_.get(); 444 Channel* channel = context_.get()->channel_.get();
444 // Channel must have been created first. 445 // Channel must have been created first.
445 DCHECK(channel) << context_.get()->channel_id_; 446 DCHECK(channel) << context_.get()->channel_id_;
446 return channel->GetClientFileDescriptor(); 447 return channel->GetClientFileDescriptor();
447 } 448 }
448 449
449 base::ScopedFD ChannelProxy::TakeClientFileDescriptor() { 450 base::ScopedFD ChannelProxy::TakeClientFileDescriptor() {
450 DCHECK(CalledOnValidThread()); 451 DCHECK(CalledOnValidThread());
451 452
452 Channel* channel = context_.get()->channel_.get(); 453 Channel* channel = context_.get()->channel_.get();
453 // Channel must have been created first. 454 // Channel must have been created first.
454 DCHECK(channel) << context_.get()->channel_id_; 455 DCHECK(channel) << context_.get()->channel_id_;
455 return channel->TakeClientFileDescriptor(); 456 return channel->TakeClientFileDescriptor();
456 } 457 }
457 #endif 458 #endif
458 459
459 //----------------------------------------------------------------------------- 460 //-----------------------------------------------------------------------------
460 461
461 } // namespace IPC 462 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/ipc_channel_proxy.h ('k') | ipc/ipc_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698