diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:34:51 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:34:51 +0000 |
| commit | cf1d779fbf1582c77df145de5ec02cd7a9f25612 (patch) | |
| tree | 37810ddc0425638b2b6a86fd2f08da041c5f4500 /ppapi/proxy/ppapi_messages.h | |
| parent | 3420503c0eb45fb0a2f8ec6316acbe9409f4c361 (diff) | |
| download | chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.zip chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.tar.gz chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.tar.bz2 | |
Add untrusted NaCl build for PPAPI proxy.
This patch refactors ppapi_shared.gypi and ppapi_proxy.gypi into proper includes, adds ppapi_shared_untrusted and ppapi_proxy_untrusted .gyp files, and integrates them into the nacl_irt build (ppapi/native_client/native_client.gyp). In order to build without link errors, it includes our plugin side initialization of PluginDispatcher, and a PpapiPluginMain definition. When the 'build_ppapi_ipc_proxy_untrusted' gyp flag is set to '1', this will build a working NaCl IRT using the Chrome IPC proxy.
BUG=116317
TEST=compiles, runs HelloWorld and GetURL SDK examples.
Review URL: https://chromiumcodereview.appspot.com/10546140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_messages.h')
| -rw-r--r-- | ppapi/proxy/ppapi_messages.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 5f3c6bd..cd54ae9 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -846,6 +846,7 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics2D_ReplaceContents, IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics2D_Flush, ppapi::HostResource /* graphics_2d */) +#if !defined(OS_NACL) // PPB_Graphics3D. IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create, PP_Instance /* instance */, @@ -884,6 +885,7 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBGraphics3D_GetTransferBuffer, uint32 /* size */) IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers, ppapi::HostResource /* graphics_3d */) +#endif // !defined(OS_NACL) // PPB_ImageData. IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_Create, |