Index: ppapi/proxy/resource_creation_proxy.cc |
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc |
index 6d39f8021d8653a449e5f7e38072be4559336edf..7b4fab6da28074e7ff63ecb2db1ddd121cc6ef2c 100644 |
--- a/ppapi/proxy/resource_creation_proxy.cc |
+++ b/ppapi/proxy/resource_creation_proxy.cc |
@@ -253,23 +253,14 @@ PP_Resource ResourceCreationProxy::CreateHostResolverPrivate( |
GetConnection(), instance))->GetReference(); |
} |
-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::CreateImageDataNaCl( |
+PP_Resource ResourceCreationProxy::CreateImageData( |
PP_Instance instance, |
+ PPB_ImageData_Shared::ImageDataType type, |
PP_ImageDataFormat format, |
const PP_Size* size, |
PP_Bool init_to_zero) { |
- // These really only are different on the host side. On the plugin side, we |
- // always request a "platform" ImageData if we're trusted, or a "NaCl" one |
- // if we're untrusted (see PPB_ImageData_Proxy::CreateProxyResource()). |
- return CreateImageData(instance, format, size, init_to_zero); |
+ return PPB_ImageData_Proxy::CreateProxyResource(instance, type, |
+ format, *size, init_to_zero); |
} |
PP_Resource ResourceCreationProxy::CreateNetworkMonitor( |