diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 23:32:46 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 23:32:46 +0000 |
| commit | 9856d2f6fa8afe73d949edeac6b85ebd35c1a3f7 (patch) | |
| tree | 1fc239e3620bacdbf5dd134f98652d177ef97cd5 | |
| parent | 39fbd832cc7b457b9a1645da8eaf320ac936323f (diff) | |
| download | chromium_src-9856d2f6fa8afe73d949edeac6b85ebd35c1a3f7.zip chromium_src-9856d2f6fa8afe73d949edeac6b85ebd35c1a3f7.tar.gz chromium_src-9856d2f6fa8afe73d949edeac6b85ebd35c1a3f7.tar.bz2 | |
Add PPB_ImageData to untrusted NaCl build.
BUG=116317
TEST=compiles
Review URL: https://chromiumcodereview.appspot.com/10411043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138170 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/ppapi_proxy_untrusted.gypi | 6 | ||||
| -rw-r--r-- | ppapi/proxy/resource_creation_proxy.cc | 16 | ||||
| -rw-r--r-- | ppapi/proxy/resource_creation_proxy.h | 8 | ||||
| -rw-r--r-- | ppapi/thunk/resource_creation_api.h | 8 |
4 files changed, 19 insertions, 19 deletions
diff --git a/ppapi/ppapi_proxy_untrusted.gypi b/ppapi/ppapi_proxy_untrusted.gypi index fa1e3a0..c6d117a 100644 --- a/ppapi/ppapi_proxy_untrusted.gypi +++ b/ppapi/ppapi_proxy_untrusted.gypi @@ -256,7 +256,7 @@ 'shared_impl/ppb_file_io_shared.cc', 'shared_impl/ppb_file_ref_shared.cc', # 'shared_impl/ppb_graphics_3d_shared.cc', -# 'shared_impl/ppb_image_data_shared.cc', + 'shared_impl/ppb_image_data_shared.cc', 'shared_impl/ppb_input_event_shared.cc', 'shared_impl/ppb_instance_shared.cc', 'shared_impl/ppb_memory_shared.cc', @@ -311,7 +311,7 @@ # 'thunk/ppb_graphics_3d_thunk.cc', # 'thunk/ppb_graphics_3d_trusted_thunk.cc', # 'thunk/ppb_host_resolver_private_thunk.cc', -# 'thunk/ppb_image_data_thunk.cc', + 'thunk/ppb_image_data_thunk.cc', # 'thunk/ppb_image_data_trusted_thunk.cc', 'thunk/ppb_instance_thunk.cc', # 'thunk/ppb_layer_compositor_thunk.cc', @@ -365,7 +365,7 @@ # 'proxy/ppb_graphics_2d_proxy.cc', # 'proxy/ppb_graphics_3d_proxy.cc', # 'proxy/ppb_host_resolver_private_proxy.cc', -# 'proxy/ppb_image_data_proxy.cc', + 'proxy/ppb_image_data_proxy.cc', 'proxy/ppb_instance_proxy.cc', 'proxy/ppb_message_loop_proxy.cc', # 'proxy/ppb_network_monitor_private_proxy.cc', diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc index b5c254c..064410e 100644 --- a/ppapi/proxy/resource_creation_proxy.cc +++ b/ppapi/proxy/resource_creation_proxy.cc @@ -166,6 +166,14 @@ PP_Resource ResourceCreationProxy::CreateAudioConfig( OBJECT_IS_PROXY, instance, sample_rate, sample_frame_count); } +PP_Resource ResourceCreationProxy::CreateImageData(PP_Instance instance, + PP_ImageDataFormat format, + const PP_Size& size, + PP_Bool init_to_zero) { + return PPB_ImageData_Proxy::CreateProxyResource(instance, format, size, + init_to_zero); +} + #if !defined(OS_NACL) PP_Resource ResourceCreationProxy::CreateAudioTrusted(PP_Instance instance) { // Proxied plugins can't create trusted audio devices. @@ -243,14 +251,6 @@ PP_Resource ResourceCreationProxy::CreateHostResolverPrivate( return PPB_HostResolver_Private_Proxy::CreateProxyResource(instance); } -PP_Resource ResourceCreationProxy::CreateImageData(PP_Instance instance, - PP_ImageDataFormat format, - const PP_Size& size, - PP_Bool init_to_zero) { - return PPB_ImageData_Proxy::CreateProxyResource(instance, format, size, - init_to_zero); -} - PP_Resource ResourceCreationProxy::CreateNetworkMonitor( PP_Instance instance, PPB_NetworkMonitor_Callback callback, diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h index 57af6f8..138d16f 100644 --- a/ppapi/proxy/resource_creation_proxy.h +++ b/ppapi/proxy/resource_creation_proxy.h @@ -88,6 +88,10 @@ class ResourceCreationProxy : public InterfaceProxy, virtual PP_Resource CreateAudioConfig(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) OVERRIDE; + virtual PP_Resource CreateImageData(PP_Instance instance, + PP_ImageDataFormat format, + const PP_Size& size, + PP_Bool init_to_zero) OVERRIDE; #if !defined(OS_NACL) virtual PP_Resource CreateAudioTrusted(PP_Instance instance) OVERRIDE; virtual PP_Resource CreateAudioInput0_1( @@ -120,10 +124,6 @@ class ResourceCreationProxy : public InterfaceProxy, PP_Resource share_context, const int32_t* attrib_list) OVERRIDE; virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateImageData(PP_Instance instance, - PP_ImageDataFormat format, - const PP_Size& size, - PP_Bool init_to_zero) OVERRIDE; virtual PP_Resource CreateNetworkMonitor( PP_Instance instance, PPB_NetworkMonitor_Callback callback, diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h index 2fd9d02..3f18275 100644 --- a/ppapi/thunk/resource_creation_api.h +++ b/ppapi/thunk/resource_creation_api.h @@ -94,6 +94,10 @@ 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; #if !defined(OS_NACL) virtual PP_Resource CreateAudioTrusted(PP_Instance instance) = 0; virtual PP_Resource CreateAudioInput0_1( @@ -125,10 +129,6 @@ 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 CreateNetworkMonitor( PP_Instance instance, PPB_NetworkMonitor_Callback callback, |