| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/child/web_url_loader_impl.h" | 5 #include "content/child/web_url_loader_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 error.localizedDescription = WebString::fromUTF8( | 960 error.localizedDescription = WebString::fromUTF8( |
| 961 net::ErrorToString(reason)); | 961 net::ErrorToString(reason)); |
| 962 } | 962 } |
| 963 return error; | 963 return error; |
| 964 } | 964 } |
| 965 | 965 |
| 966 void WebURLLoaderImpl::PopulateURLResponse(const GURL& url, | 966 void WebURLLoaderImpl::PopulateURLResponse(const GURL& url, |
| 967 const ResourceResponseInfo& info, | 967 const ResourceResponseInfo& info, |
| 968 WebURLResponse* response) { | 968 WebURLResponse* response) { |
| 969 response->setURL(url); | 969 response->setURL(url); |
| 970 response->setResponseTime(info.response_time.ToDoubleT()); | 970 response->setResponseTime(info.response_time.ToInternalValue()); |
| 971 // FIXME: remove static cast once setResponseTime is no longer overloaded. | |
| 972 response->setResponseTime( | |
| 973 static_cast<long long>(info.response_time.ToInternalValue())); | |
| 974 response->setMIMEType(WebString::fromUTF8(info.mime_type)); | 971 response->setMIMEType(WebString::fromUTF8(info.mime_type)); |
| 975 response->setTextEncodingName(WebString::fromUTF8(info.charset)); | 972 response->setTextEncodingName(WebString::fromUTF8(info.charset)); |
| 976 response->setExpectedContentLength(info.content_length); | 973 response->setExpectedContentLength(info.content_length); |
| 977 response->setSecurityInfo(info.security_info); | 974 response->setSecurityInfo(info.security_info); |
| 978 response->setAppCacheID(info.appcache_id); | 975 response->setAppCacheID(info.appcache_id); |
| 979 response->setAppCacheManifestURL(info.appcache_manifest_url); | 976 response->setAppCacheManifestURL(info.appcache_manifest_url); |
| 980 response->setWasCached(!info.load_timing.request_start_time.is_null() && | 977 response->setWasCached(!info.load_timing.request_start_time.is_null() && |
| 981 info.response_time < info.load_timing.request_start_time); | 978 info.response_time < info.load_timing.request_start_time); |
| 982 response->setRemoteIPAddress( | 979 response->setRemoteIPAddress( |
| 983 WebString::fromUTF8(info.socket_address.host())); | 980 WebString::fromUTF8(info.socket_address.host())); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1138 int intra_priority_value) { | 1135 int intra_priority_value) { |
| 1139 context_->DidChangePriority(new_priority, intra_priority_value); | 1136 context_->DidChangePriority(new_priority, intra_priority_value); |
| 1140 } | 1137 } |
| 1141 | 1138 |
| 1142 bool WebURLLoaderImpl::attachThreadedDataReceiver( | 1139 bool WebURLLoaderImpl::attachThreadedDataReceiver( |
| 1143 blink::WebThreadedDataReceiver* threaded_data_receiver) { | 1140 blink::WebThreadedDataReceiver* threaded_data_receiver) { |
| 1144 return context_->AttachThreadedDataReceiver(threaded_data_receiver); | 1141 return context_->AttachThreadedDataReceiver(threaded_data_receiver); |
| 1145 } | 1142 } |
| 1146 | 1143 |
| 1147 } // namespace content | 1144 } // namespace content |
| OLD | NEW |