summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-03 23:23:51 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-03 23:23:51 +0000
commitaf80c6517cbe88c4f25ba55a9c2255b44a718caf (patch)
tree46e47a6b6094b4049489df2ee0986bf9fdad0807 /ppapi
parent1a1c701c8e4a6adfb3a1741affc129dbd2ae477c (diff)
downloadchromium_src-af80c6517cbe88c4f25ba55a9c2255b44a718caf.zip
chromium_src-af80c6517cbe88c4f25ba55a9c2255b44a718caf.tar.gz
chromium_src-af80c6517cbe88c4f25ba55a9c2255b44a718caf.tar.bz2
Add audio interface proxies to untrusted NaCl build.
BUG=116317 TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10704088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/thunk/interfaces_ppb_public_stable.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index fb803fe..11b168a 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -17,6 +17,7 @@
// For PROXIED_APIs, these also correspond to *_Proxy objects. The proxied ones
// define factory functions for each of these classes. UNPROXIED_APIs are ones
// that exist in the webkit/plugins/ppapi/*_impl.h, but not in the proxy.
+PROXIED_API(PPB_Audio)
PROXIED_API(PPB_Core)
PROXIED_API(PPB_FileIO)
PROXIED_API(PPB_FileRef)
@@ -27,12 +28,9 @@ PROXIED_API(PPB_Instance)
PROXIED_API(PPB_URLLoader)
PROXIED_API(PPB_URLResponseInfo)
-#if !defined(OS_NACL) // TODO(bbudge) Port to NaCl.
-PROXIED_API(PPB_Audio)
// AudioConfig isn't proxied in the normal way, we have only local classes and
// serialize it to a struct when we need it on the host side.
UNPROXIED_API(PPB_AudioConfig)
-#endif // !defined(OS_NACL)
// Interfaces
// ----------
@@ -50,6 +48,7 @@ UNPROXIED_API(PPB_AudioConfig)
// The interface_struct is the typename of the struct corresponding to the
// interface string.
// Note: Core is special and is registered manually.
+PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0)
PROXIED_IFACE(PPB_FileIO, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0)
PROXIED_IFACE(PPB_FileRef, PPB_FILEREF_INTERFACE_1_0, PPB_FileRef_1_0)
PROXIED_IFACE(PPB_FileSystem, PPB_FILESYSTEM_INTERFACE_1_0, PPB_FileSystem_1_0)
@@ -78,11 +77,11 @@ PROXIED_IFACE(PPB_URLResponseInfo, PPB_URLRESPONSEINFO_INTERFACE_1_0,
// Note: PPB_Var and PPB_VarArrayBuffer are special and registered manually.
PROXIED_IFACE(NoAPIName, PPB_VIEW_INTERFACE_1_0, PPB_View_1_0)
-#if !defined(OS_NACL) // TODO(bbudge) Port to NaCl.
-PROXIED_IFACE(PPB_Audio, PPB_AUDIO_INTERFACE_1_0, PPB_Audio_1_0)
// This has no corresponding _Proxy object since it does no IPC.
PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_0, PPB_AudioConfig_1_0)
PROXIED_IFACE(NoAPIName, PPB_AUDIO_CONFIG_INTERFACE_1_1, PPB_AudioConfig_1_1)
+
+#if !defined(OS_NACL) // TODO(bbudge) Port to NaCl.
PROXIED_IFACE(PPB_Graphics3D, PPB_GRAPHICS_3D_INTERFACE_1_0, PPB_Graphics3D_1_0)
PROXIED_IFACE(PPB_Instance, PPB_MOUSECURSOR_INTERFACE_1_0, PPB_MouseCursor_1_0)
#endif // !defined(OS_NACL)