summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/interface_list.cc
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 22:34:30 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 22:34:30 +0000
commit9ca8a523133e80ad0f0a6d4ae48c216f119692ef (patch)
treeb3988c9c43612551bda255fd367d9d73475b8ee3 /ppapi/proxy/interface_list.cc
parentb9a383d78d91cce289b8208d730319a23e1c2c3e (diff)
downloadchromium_src-9ca8a523133e80ad0f0a6d4ae48c216f119692ef.zip
chromium_src-9ca8a523133e80ad0f0a6d4ae48c216f119692ef.tar.gz
chromium_src-9ca8a523133e80ad0f0a6d4ae48c216f119692ef.tar.bz2
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 all code needed for 3d and OpenGL ES. Review URL: https://chromiumcodereview.appspot.com/10837145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.cc')
-rw-r--r--ppapi/proxy/interface_list.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 292e260..fbd59c3 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -194,7 +194,6 @@ 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,
@@ -211,6 +210,7 @@ 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());
-#if !defined(OS_NACL)
AddPPP(PPP_Graphics3D_Proxy::GetInfo());
+#if !defined(OS_NACL)
AddPPP(PPP_Instance_Private_Proxy::GetInfo());
AddPPP(PPP_VideoCapture_Proxy::GetInfo());
AddPPP(PPP_VideoDecoder_Proxy::GetInfo());