Chromium Code Reviews| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 948 response->setMIMEType(WebString::fromUTF8(info.mime_type)); | 948 response->setMIMEType(WebString::fromUTF8(info.mime_type)); |
| 949 response->setTextEncodingName(WebString::fromUTF8(info.charset)); | 949 response->setTextEncodingName(WebString::fromUTF8(info.charset)); |
| 950 response->setExpectedContentLength(info.content_length); | 950 response->setExpectedContentLength(info.content_length); |
| 951 response->setSecurityInfo(info.security_info); | 951 response->setSecurityInfo(info.security_info); |
| 952 response->setHasMajorCertificateErrors(info.has_major_certificate_errors); | 952 response->setHasMajorCertificateErrors(info.has_major_certificate_errors); |
| 953 response->setAppCacheID(info.appcache_id); | 953 response->setAppCacheID(info.appcache_id); |
| 954 response->setAppCacheManifestURL(info.appcache_manifest_url); | 954 response->setAppCacheManifestURL(info.appcache_manifest_url); |
| 955 response->setWasCached(!info.load_timing.request_start_time.is_null() && | 955 response->setWasCached(!info.load_timing.request_start_time.is_null() && |
| 956 info.response_time < info.load_timing.request_start_time); | 956 info.response_time < info.load_timing.request_start_time); |
| 957 response->setRemoteIPAddress( | 957 response->setRemoteIPAddress( |
| 958 WebString::fromUTF8(info.socket_address.host())); | 958 WebString::fromUTF8(info.socket_address.HostForURL())); |
|
philipj_slow
2016/03/04 04:35:08
Is this the "pretty bad bug"? I can't review here.
Mike West
2016/03/04 05:53:54
Yes. `host` returns an IPv6 address as `::1`, whil
Mike West
2016/03/04 08:58:21
Added 'WebURLLoaderImplTest.ResponseIPAddress'.
| |
| 959 response->setRemotePort(info.socket_address.port()); | 959 response->setRemotePort(info.socket_address.port()); |
| 960 response->setConnectionID(info.load_timing.socket_log_id); | 960 response->setConnectionID(info.load_timing.socket_log_id); |
| 961 response->setConnectionReused(info.load_timing.socket_reused); | 961 response->setConnectionReused(info.load_timing.socket_reused); |
| 962 response->setDownloadFilePath(info.download_file_path.AsUTF16Unsafe()); | 962 response->setDownloadFilePath(info.download_file_path.AsUTF16Unsafe()); |
| 963 response->setWasFetchedViaSPDY(info.was_fetched_via_spdy); | 963 response->setWasFetchedViaSPDY(info.was_fetched_via_spdy); |
| 964 response->setWasFetchedViaServiceWorker(info.was_fetched_via_service_worker); | 964 response->setWasFetchedViaServiceWorker(info.was_fetched_via_service_worker); |
| 965 response->setWasFallbackRequiredByServiceWorker( | 965 response->setWasFallbackRequiredByServiceWorker( |
| 966 info.was_fallback_required_by_service_worker); | 966 info.was_fallback_required_by_service_worker); |
| 967 response->setServiceWorkerResponseType(info.response_type_via_service_worker); | 967 response->setServiceWorkerResponseType(info.response_type_via_service_worker); |
| 968 response->setOriginalURLViaServiceWorker( | 968 response->setOriginalURLViaServiceWorker( |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1154 } | 1154 } |
| 1155 | 1155 |
| 1156 void WebURLLoaderImpl::setLoadingTaskRunner( | 1156 void WebURLLoaderImpl::setLoadingTaskRunner( |
| 1157 blink::WebTaskRunner* loading_task_runner) { | 1157 blink::WebTaskRunner* loading_task_runner) { |
| 1158 // There's no guarantee on the lifetime of |loading_task_runner| so we take a | 1158 // There's no guarantee on the lifetime of |loading_task_runner| so we take a |
| 1159 // copy. | 1159 // copy. |
| 1160 context_->SetWebTaskRunner(make_scoped_ptr(loading_task_runner->clone())); | 1160 context_->SetWebTaskRunner(make_scoped_ptr(loading_task_runner->clone())); |
| 1161 } | 1161 } |
| 1162 | 1162 |
| 1163 } // namespace content | 1163 } // namespace content |
| OLD | NEW |