OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // An implementation of WebURLLoader in terms of ResourceLoaderBridge. | 5 // An implementation of WebURLLoader in terms of ResourceLoaderBridge. |
6 | 6 |
7 #include "webkit/glue/weburlloader_impl.h" | 7 #include "webkit/glue/weburlloader_impl.h" |
8 | 8 |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 response->setWasAlternateProtocolAvailable( | 188 response->setWasAlternateProtocolAvailable( |
189 info.was_alternate_protocol_available); | 189 info.was_alternate_protocol_available); |
190 response->setWasFetchedViaProxy(info.was_fetched_via_proxy); | 190 response->setWasFetchedViaProxy(info.was_fetched_via_proxy); |
191 response->setRemoteIPAddress( | 191 response->setRemoteIPAddress( |
192 WebString::fromUTF8(info.socket_address.host())); | 192 WebString::fromUTF8(info.socket_address.host())); |
193 response->setRemotePort(info.socket_address.port()); | 193 response->setRemotePort(info.socket_address.port()); |
194 response->setConnectionID(info.connection_id); | 194 response->setConnectionID(info.connection_id); |
195 response->setConnectionReused(info.connection_reused); | 195 response->setConnectionReused(info.connection_reused); |
196 response->setDownloadFilePath(FilePathToWebString(info.download_file_path)); | 196 response->setDownloadFilePath(FilePathToWebString(info.download_file_path)); |
197 | 197 |
198 WebURLLoadTiming timing; | |
199 timing.initialize(); | |
200 const ResourceLoadTimingInfo& timing_info = info.load_timing; | 198 const ResourceLoadTimingInfo& timing_info = info.load_timing; |
201 timing.setRequestTime(timing_info.base_time.ToDoubleT()); | 199 if (!timing_info.base_time.is_null()) { |
202 timing.setProxyStart(timing_info.proxy_start); | 200 WebURLLoadTiming timing; |
203 timing.setProxyEnd(timing_info.proxy_end); | 201 timing.initialize(); |
204 timing.setDNSStart(timing_info.dns_start); | 202 timing.setRequestTime(timing_info.base_time.ToDoubleT()); |
205 timing.setDNSEnd(timing_info.dns_end); | 203 timing.setProxyStart(timing_info.proxy_start); |
206 timing.setConnectStart(timing_info.connect_start); | 204 timing.setProxyEnd(timing_info.proxy_end); |
207 timing.setConnectEnd(timing_info.connect_end); | 205 timing.setDNSStart(timing_info.dns_start); |
208 timing.setSSLStart(timing_info.ssl_start); | 206 timing.setDNSEnd(timing_info.dns_end); |
209 timing.setSSLEnd(timing_info.ssl_end); | 207 timing.setConnectStart(timing_info.connect_start); |
210 timing.setSendStart(timing_info.send_start); | 208 timing.setConnectEnd(timing_info.connect_end); |
211 timing.setSendEnd(timing_info.send_end); | 209 timing.setSSLStart(timing_info.ssl_start); |
212 timing.setReceiveHeadersEnd(timing_info.receive_headers_end); | 210 timing.setSSLEnd(timing_info.ssl_end); |
213 response->setLoadTiming(timing); | 211 timing.setSendStart(timing_info.send_start); |
| 212 timing.setSendEnd(timing_info.send_end); |
| 213 timing.setReceiveHeadersEnd(timing_info.receive_headers_end); |
| 214 response->setLoadTiming(timing); |
| 215 } |
214 | 216 |
215 if (info.devtools_info.get()) { | 217 if (info.devtools_info.get()) { |
216 WebHTTPLoadInfo load_info; | 218 WebHTTPLoadInfo load_info; |
217 | 219 |
218 load_info.setHTTPStatusCode(info.devtools_info->http_status_code); | 220 load_info.setHTTPStatusCode(info.devtools_info->http_status_code); |
219 load_info.setHTTPStatusText(WebString::fromUTF8( | 221 load_info.setHTTPStatusText(WebString::fromUTF8( |
220 info.devtools_info->http_status_text)); | 222 info.devtools_info->http_status_text)); |
221 | 223 |
222 const HeadersVector& request_headers = info.devtools_info->request_headers; | 224 const HeadersVector& request_headers = info.devtools_info->request_headers; |
223 for (HeadersVector::const_iterator it = request_headers.begin(); | 225 for (HeadersVector::const_iterator it = request_headers.begin(); |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 | 750 |
749 void WebURLLoaderImpl::cancel() { | 751 void WebURLLoaderImpl::cancel() { |
750 context_->Cancel(); | 752 context_->Cancel(); |
751 } | 753 } |
752 | 754 |
753 void WebURLLoaderImpl::setDefersLoading(bool value) { | 755 void WebURLLoaderImpl::setDefersLoading(bool value) { |
754 context_->SetDefersLoading(value); | 756 context_->SetDefersLoading(value); |
755 } | 757 } |
756 | 758 |
757 } // namespace webkit_glue | 759 } // namespace webkit_glue |
OLD | NEW |