Index: webkit/plugins/ppapi/ppb_transport_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_transport_impl.cc (revision 88104) |
+++ webkit/plugins/ppapi/ppb_transport_impl.cc (working copy) |
@@ -53,14 +53,18 @@ |
int32_t Connect(PP_Resource resource, PP_CompletionCallback callback) { |
scoped_refptr<PPB_Transport_Impl> t( |
Resource::GetAs<PPB_Transport_Impl>(resource)); |
- return (t.get()) ? t->Connect(callback) : PP_ERROR_BADRESOURCE; |
+ if (!t.get()) |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ return MayForceCallback(callback, t->Connect(callback)); |
} |
int32_t GetNextAddress(PP_Resource resource, PP_Var* address, |
PP_CompletionCallback callback) { |
scoped_refptr<PPB_Transport_Impl> t( |
Resource::GetAs<PPB_Transport_Impl>(resource)); |
- return (t.get())? t->GetNextAddress(address, callback) : PP_ERROR_BADRESOURCE; |
+ if (!t.get()) |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ return MayForceCallback(callback, t->GetNextAddress(address, callback)); |
} |
int32_t ReceiveRemoteAddress(PP_Resource resource, PP_Var address) { |
@@ -73,14 +77,18 @@ |
PP_CompletionCallback callback) { |
scoped_refptr<PPB_Transport_Impl> t( |
Resource::GetAs<PPB_Transport_Impl>(resource)); |
- return (t.get())? t->Recv(data, len, callback) : PP_ERROR_BADRESOURCE; |
+ if (!t.get()) |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ return MayForceCallback(callback, t->Recv(data, len, callback)); |
} |
int32_t Send(PP_Resource resource, const void* data, uint32_t len, |
PP_CompletionCallback callback) { |
scoped_refptr<PPB_Transport_Impl> t( |
Resource::GetAs<PPB_Transport_Impl>(resource)); |
- return (t.get())? t->Send(data, len, callback) : PP_ERROR_BADRESOURCE; |
+ if (!t.get()) |
+ return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
+ return MayForceCallback(callback, t->Send(data, len, callback)); |
} |
// Disconnects from the remote peer. |