| Index: ppapi/proxy/ppb_flash_net_connector_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_flash_net_connector_proxy.cc (revision 88104)
|
| +++ ppapi/proxy/ppb_flash_net_connector_proxy.cc (working copy)
|
| @@ -12,6 +12,7 @@
|
| #include "ppapi/proxy/plugin_resource.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/proxy/serialized_var.h"
|
| +#include "ppapi/thunk/common.h"
|
|
|
| namespace pp {
|
| namespace proxy {
|
| @@ -168,13 +169,14 @@
|
| FlashNetConnector* object =
|
| PluginResource::GetAs<FlashNetConnector>(connector_id);
|
| if (!object)
|
| - return PP_ERROR_BADARGUMENT;
|
| - return ConnectWithMessage(
|
| + return ppapi::thunk::MayForceCallback(callback, PP_ERROR_BADARGUMENT);
|
| + int32_t result = ConnectWithMessage(
|
| object,
|
| new PpapiHostMsg_PPBFlashNetConnector_ConnectTcp(
|
| INTERFACE_ID_PPB_FLASH_NETCONNECTOR,
|
| object->host_resource(), host, port),
|
| socket_out, local_addr_out, remote_addr_out, callback);
|
| + return ppapi::thunk::MayForceCallback(callback, result);
|
| }
|
|
|
| int32_t ConnectTcpAddress(PP_Resource connector_id,
|
| @@ -186,13 +188,14 @@
|
| FlashNetConnector* object =
|
| PluginResource::GetAs<FlashNetConnector>(connector_id);
|
| if (!object)
|
| - return PP_ERROR_BADARGUMENT;
|
| - return ConnectWithMessage(
|
| + return ppapi::thunk::MayForceCallback(callback, PP_ERROR_BADARGUMENT);
|
| + int32_t result = ConnectWithMessage(
|
| object,
|
| new PpapiHostMsg_PPBFlashNetConnector_ConnectTcpAddress(
|
| INTERFACE_ID_PPB_FLASH_NETCONNECTOR,
|
| object->host_resource(), NetAddressToString(*addr)),
|
| socket_out, local_addr_out, remote_addr_out, callback);
|
| + return ppapi::thunk::MayForceCallback(callback, result);
|
| }
|
|
|
| const PPB_Flash_NetConnector flash_netconnector_interface = {
|
|
|