diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 21:18:19 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 21:18:19 +0000 |
| commit | fe5d406f982a080ff3b8a503d6b487f16c812d48 (patch) | |
| tree | 77595f2b8f7e136562deedba553339ea2028568b /ppapi | |
| parent | de1d2f80e33170f57c942e4950b1a75d4056a127 (diff) | |
| download | chromium_src-fe5d406f982a080ff3b8a503d6b487f16c812d48.zip chromium_src-fe5d406f982a080ff3b8a503d6b487f16c812d48.tar.gz chromium_src-fe5d406f982a080ff3b8a503d6b487f16c812d48.tar.bz2 | |
Add ipc_channel_nacl to the untrusted build and fix all compile/link errors.
ppapi_proxy_untrusted.gyp should now build with a single link error for main.
BUG=116317
TEST=builds with a single link error for main().
Review URL: https://chromiumcodereview.appspot.com/10167024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_proxy_untrusted.gyp | 5 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp index c640a23..396b97c 100644 --- a/ppapi/ppapi_proxy_untrusted.gyp +++ b/ppapi/ppapi_proxy_untrusted.gyp @@ -202,11 +202,14 @@ ], 'sources': [ '../ipc/file_descriptor_set_posix.cc', -# '../ipc/ipc_channel_posix.cc', + '../ipc/ipc_channel.cc', + '../ipc/ipc_channel_nacl.cc', '../ipc/ipc_channel_proxy.cc', + '../ipc/ipc_channel_reader.cc', '../ipc/ipc_logging.cc', '../ipc/ipc_message.cc', '../ipc/ipc_message_utils.cc', + '../ipc/ipc_platform_file.cc', '../ipc/ipc_sync_channel.cc', '../ipc/ipc_sync_message.cc', '../ipc/ipc_sync_message_filter.cc', diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 88e6521..77afa30 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -413,6 +413,7 @@ PP_Bool PPB_Instance_Proxy::SetCursor(PP_Instance instance, PP_MouseCursor_Type type, PP_Resource image, const PP_Point* hot_spot) { +#if !defined(OS_NACL) // Some of these parameters are important for security. This check is in the // plugin process just for the convenience of the caller (since we don't // bother returning errors from the other process with a sync message). The @@ -433,6 +434,9 @@ PP_Bool PPB_Instance_Proxy::SetCursor(PP_Instance instance, API_ID_PPB_INSTANCE, instance, static_cast<int32_t>(type), image_host_resource, hot_spot ? *hot_spot : PP_MakePoint(0, 0))); return PP_TRUE; +#else // defined(OS_NACL) + return PP_FALSE; +#endif } int32_t PPB_Instance_Proxy::LockMouse(PP_Instance instance, |