diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 22:02:24 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 22:02:24 +0000 |
| commit | 800c8d730fc85e7bf9b548947f5842828346c485 (patch) | |
| tree | 3522f743ae1e8d474278af6ca28e4a0183de4175 /ppapi/proxy | |
| parent | 6c64593b006e833c6712c534acccbb2b79126135 (diff) | |
| download | chromium_src-800c8d730fc85e7bf9b548947f5842828346c485.zip chromium_src-800c8d730fc85e7bf9b548947f5842828346c485.tar.gz chromium_src-800c8d730fc85e7bf9b548947f5842828346c485.tar.bz2 | |
Revert 139635 - PPAPI/NaCl: Speculative implementation for ipc_channel_nacl.cc
BUG=116317
TEST=
Review URL: https://chromiumcodereview.appspot.com/10174048
TBR=dmichael@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10456039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/proxy_channel.cc | 2 | ||||
| -rw-r--r-- | ppapi/proxy/proxy_channel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc index f5743e8..c67d83c 100644 --- a/ppapi/proxy/proxy_channel.cc +++ b/ppapi/proxy/proxy_channel.cc @@ -40,7 +40,7 @@ void ProxyChannel::OnChannelError() { channel_.reset(); } -#if defined(OS_POSIX) && !defined(OS_NACL) +#if defined(OS_POSIX) int ProxyChannel::TakeRendererFD() { DCHECK(channel()); return channel()->TakeClientFileDescriptor(); diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h index ffd3f2f..424da94 100644 --- a/ppapi/proxy/proxy_channel.h +++ b/ppapi/proxy/proxy_channel.h @@ -78,7 +78,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel return channel_.get(); } -#if defined(OS_POSIX) && !defined(OS_NACL) +#if defined(OS_POSIX) int TakeRendererFD(); #endif |