| 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..c6754b713aa68e0c542de2e64b0e2c4ab1cd6588 100644
|
| --- a/ppapi/proxy/resource_creation_proxy.cc
|
| +++ b/ppapi/proxy/resource_creation_proxy.cc
|
| @@ -253,23 +253,24 @@ 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) {
|
| +PP_Resource ResourceCreationProxy::CreateImageDataPlatform(
|
| + 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);
|
| + init_to_zero,
|
| + PP_TRUE /* platform */);
|
| }
|
|
|
| -PP_Resource ResourceCreationProxy::CreateImageDataNaCl(
|
| +PP_Resource ResourceCreationProxy::CreateImageDataSimple(
|
| PP_Instance instance,
|
| 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, format, *size,
|
| + init_to_zero,
|
| + PP_FALSE /* platform */);
|
| }
|
|
|
| PP_Resource ResourceCreationProxy::CreateNetworkMonitor(
|
|
|