| Index: ppapi/proxy/resource_creation_proxy.cc
|
| diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
|
| index c157d0751cbcd4e0ec29c9168e61a45aefca5b90..3448ce7822651c18817089cc79665f52b82b1c26 100644
|
| --- a/ppapi/proxy/resource_creation_proxy.cc
|
| +++ b/ppapi/proxy/resource_creation_proxy.cc
|
| @@ -254,23 +254,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::CreateNetAddressFromIPv4Address(
|
|
|