diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 00:50:53 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 00:50:53 +0000 |
| commit | fc31d3070e929451e0bf37c8698e13c07da9d9cd (patch) | |
| tree | 99bd6c3a7a5804df02d5adb4e41eb92a78512d9c /ppapi/thunk | |
| parent | 7f531d4d3e00bee23502ba8a9bf229bcfad47dcf (diff) | |
| download | chromium_src-fc31d3070e929451e0bf37c8698e13c07da9d9cd.zip chromium_src-fc31d3070e929451e0bf37c8698e13c07da9d9cd.tar.gz chromium_src-fc31d3070e929451e0bf37c8698e13c07da9d9cd.tar.bz2 | |
Add PPB_FileChooser_Dev to the NaCl IPC proxy.
BUG=116317
TEST=compiles
Review URL: https://codereview.chromium.org/11411160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_public_dev.h | 8 | ||||
| -rw-r--r-- | ppapi/thunk/resource_creation_api.h | 23 |
2 files changed, 15 insertions, 16 deletions
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index 6fb578e..f7c20dc 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -9,6 +9,10 @@ PROXIED_IFACE(NoAPIName, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4, PPB_CursorControl_Dev_0_4) +PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_5, + PPB_FileChooser_Dev_0_5) +PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_6, + PPB_FileChooser_Dev_0_6) PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1) #if !defined(OS_NACL) @@ -33,10 +37,6 @@ PROXIED_IFACE(NoAPIName, PPB_DEVICEREF_DEV_INTERFACE_0_1, PPB_DeviceRef_Dev_0_1) UNPROXIED_IFACE(PPB_DirectoryReader, PPB_DIRECTORYREADER_DEV_INTERFACE_0_5, PPB_DirectoryReader_Dev_0_5) UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3) -PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_5, - PPB_FileChooser_Dev_0_5) -PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_6, - PPB_FileChooser_Dev_0_6) PROXIED_IFACE(NoAPIName, PPB_GRAPHICS2D_DEV_INTERFACE_0_1, PPB_Graphics2D_Dev_0_1) PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev_0_4) diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h index cd0505c..53038c5 100644 --- a/ppapi/thunk/resource_creation_api.h +++ b/ppapi/thunk/resource_creation_api.h @@ -109,14 +109,9 @@ class ResourceCreationAPI { virtual PP_Resource CreateAudioConfig(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) = 0; - virtual PP_Resource CreateImageData(PP_Instance instance, - PP_ImageDataFormat format, - const PP_Size& size, - PP_Bool init_to_zero) = 0; - virtual PP_Resource CreateImageDataNaCl(PP_Instance instance, - PP_ImageDataFormat format, - const PP_Size& size, - PP_Bool init_to_zero) = 0; + virtual PP_Resource CreateFileChooser(PP_Instance instance, + PP_FileChooserMode_Dev mode, + const char* accept_types) = 0; virtual PP_Resource CreateGraphics2D(PP_Instance instance, const PP_Size& size, PP_Bool is_always_opaque) = 0; @@ -127,6 +122,14 @@ class ResourceCreationAPI { PP_Resource share_context, const int32_t* attrib_list) = 0; virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) = 0; + virtual PP_Resource CreateImageData(PP_Instance instance, + PP_ImageDataFormat format, + const PP_Size& size, + PP_Bool init_to_zero) = 0; + virtual PP_Resource CreateImageDataNaCl(PP_Instance instance, + PP_ImageDataFormat format, + const PP_Size& size, + PP_Bool init_to_zero) = 0; virtual PP_Resource CreateNetworkMonitor( PP_Instance instance, PPB_NetworkMonitor_Callback callback, @@ -144,10 +147,6 @@ class ResourceCreationAPI { const PP_BrowserFont_Trusted_Description* description) = 0; virtual PP_Resource CreateBuffer(PP_Instance instance, uint32_t size) = 0; virtual PP_Resource CreateDirectoryReader(PP_Resource directory_ref) = 0; - virtual PP_Resource CreateFileChooser( - PP_Instance instance, - PP_FileChooserMode_Dev mode, - const char* accept_types) = 0; virtual PP_Resource CreateFlashDeviceID(PP_Instance instance) = 0; virtual PP_Resource CreateFlashFontFile( PP_Instance instance, |