OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.
h" | 5 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.
h" |
6 | 6 |
7 #include <cstring> | 7 #include <cstring> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
640 | 640 |
641 state_.SetPendingTransition(TCPSocketState::CONNECT); | 641 state_.SetPendingTransition(TCPSocketState::CONNECT); |
642 address_index_ = 0; | 642 address_index_ = 0; |
643 address_list_.clear(); | 643 address_list_.clear(); |
644 net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port)); | 644 net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port)); |
645 net::HostResolver* resolver = resource_context->GetHostResolver(); | 645 net::HostResolver* resolver = resource_context->GetHostResolver(); |
646 int net_result = resolver->Resolve( | 646 int net_result = resolver->Resolve( |
647 request_info, net::DEFAULT_PRIORITY, &address_list_, | 647 request_info, net::DEFAULT_PRIORITY, &address_list_, |
648 base::Bind(&PepperTCPSocketMessageFilter::OnResolveCompleted, | 648 base::Bind(&PepperTCPSocketMessageFilter::OnResolveCompleted, |
649 base::Unretained(this), context), | 649 base::Unretained(this), context), |
650 &request_, net::BoundNetLog()); | 650 &request_, net::NetLogWithSource()); |
651 if (net_result != net::ERR_IO_PENDING) | 651 if (net_result != net::ERR_IO_PENDING) |
652 OnResolveCompleted(context, net_result); | 652 OnResolveCompleted(context, net_result); |
653 } | 653 } |
654 | 654 |
655 void PepperTCPSocketMessageFilter::DoConnectWithNetAddress( | 655 void PepperTCPSocketMessageFilter::DoConnectWithNetAddress( |
656 const ppapi::host::ReplyMessageContext& context, | 656 const ppapi::host::ReplyMessageContext& context, |
657 const PP_NetAddress_Private& net_addr) { | 657 const PP_NetAddress_Private& net_addr) { |
658 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 658 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
659 | 659 |
660 if (!state_.IsValidTransition(TCPSocketState::CONNECT)) { | 660 if (!state_.IsValidTransition(TCPSocketState::CONNECT)) { |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1138 const ppapi::host::ReplyMessageContext& context, | 1138 const ppapi::host::ReplyMessageContext& context, |
1139 int32_t pp_error) { | 1139 int32_t pp_error) { |
1140 SendAcceptReply(context, | 1140 SendAcceptReply(context, |
1141 pp_error, | 1141 pp_error, |
1142 0, | 1142 0, |
1143 NetAddressPrivateImpl::kInvalidNetAddress, | 1143 NetAddressPrivateImpl::kInvalidNetAddress, |
1144 NetAddressPrivateImpl::kInvalidNetAddress); | 1144 NetAddressPrivateImpl::kInvalidNetAddress); |
1145 } | 1145 } |
1146 | 1146 |
1147 } // namespace content | 1147 } // namespace content |
OLD | NEW |