| Index: ppapi/proxy/tcp_socket_resource_base.cc
|
| diff --git a/ppapi/proxy/tcp_socket_resource_base.cc b/ppapi/proxy/tcp_socket_resource_base.cc
|
| index 2ec45c25f4f9d67aeb8f5e6f9bf5467e695738ee..356a43e22db0414d39b2cd14b10955bb0517b276 100644
|
| --- a/ppapi/proxy/tcp_socket_resource_base.cc
|
| +++ b/ppapi/proxy/tcp_socket_resource_base.cc
|
| @@ -207,7 +207,8 @@ int32_t TCPSocketResourceBase::ReadImpl(
|
| return PP_ERROR_INPROGRESS;
|
| read_buffer_ = buffer;
|
| bytes_to_read_ =
|
| - std::min(bytes_to_read, TCPSocketResourceConstants::kMaxReadSize);
|
| + std::min(bytes_to_read,
|
| + static_cast<int32_t>(TCPSocketResourceConstants::kMaxReadSize));
|
| read_callback_ = callback;
|
|
|
| Call<PpapiPluginMsg_TCPSocket_ReadReply>(
|
|
|