diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:03:16 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:03:16 +0000 |
| commit | b69afa2be89d69abee78bda14e6d95f933b42aae (patch) | |
| tree | eb10a95c93a0efb68545fefb14fb71defcc9fe9d /ppapi/proxy/interface_list.cc | |
| parent | 1555f8cd3784f3d980098822079e43e18bdb8ba2 (diff) | |
| download | chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.zip chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.tar.gz chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.tar.bz2 | |
Revert 150343 - Add gpu targets to untrusted build, and add Graphics3D code to untrusted build.
BUG=116317
TEST=builds,manual
With this change, the IPC-based PPAPI proxy builds and runs the tumbler example.
Review URL: https://chromiumcodereview.appspot.com/10796038
TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10830197
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.cc')
| -rw-r--r-- | ppapi/proxy/interface_list.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index fbd59c3..292e260 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -194,6 +194,7 @@ InterfaceList::InterfaceList() { PPB_Core_Proxy::GetPPB_Core_Interface()); AddPPB(PPB_MESSAGELOOP_DEV_INTERFACE_0_1, API_ID_NONE, PPB_MessageLoop_Proxy::GetInterface()); +#if !defined(OS_NACL) AddPPB(PPB_OPENGLES2_INTERFACE_1_0, API_ID_NONE, PPB_OpenGLES2_Shared::GetInterface()); AddPPB(PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0, API_ID_NONE, @@ -210,7 +211,6 @@ InterfaceList::InterfaceList() { PPB_OpenGLES2_Shared::GetChromiumMapSubInterface()); AddPPB(PPB_OPENGLES2_QUERY_INTERFACE_1_0, API_ID_NONE, PPB_OpenGLES2_Shared::GetQueryInterface()); -#if !defined(OS_NACL) AddPPB(PPB_FLASH_PRINT_INTERFACE_1_0, API_ID_PPB_FLASH, PPB_Flash_Proxy::GetFlashPrintInterface()); #endif @@ -250,8 +250,8 @@ InterfaceList::InterfaceList() { AddPPP(PPP_InputEvent_Proxy::GetInfo()); AddPPP(PPP_Messaging_Proxy::GetInfo()); AddPPP(PPP_MouseLock_Proxy::GetInfo()); - AddPPP(PPP_Graphics3D_Proxy::GetInfo()); #if !defined(OS_NACL) + AddPPP(PPP_Graphics3D_Proxy::GetInfo()); AddPPP(PPP_Instance_Private_Proxy::GetInfo()); AddPPP(PPP_VideoCapture_Proxy::GetInfo()); AddPPP(PPP_VideoDecoder_Proxy::GetInfo()); |