summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorvsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 13:59:26 +0000
committervsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 13:59:26 +0000
commitaff6cda58f0574ccd44342d644d890beef2ac24f (patch)
tree517e6e0edf00d81024ca0a28b7d4796149c37c65 /webkit/glue
parent2d22acb06652a845aca101b5df19812648757853 (diff)
downloadchromium_src-aff6cda58f0574ccd44342d644d890beef2ac24f.zip
chromium_src-aff6cda58f0574ccd44342d644d890beef2ac24f.tar.gz
chromium_src-aff6cda58f0574ccd44342d644d890beef2ac24f.tar.bz2
Revert "Fixed network data for data uri resources"
TBR=pfeldman@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/weburlloader_impl.cc32
1 files changed, 15 insertions, 17 deletions
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index e09c95b..6182815 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -194,24 +194,22 @@ void PopulateURLResponse(
response->setConnectionReused(info.connection_reused);
response->setDownloadFilePath(FilePathToWebString(info.download_file_path));
+ WebURLLoadTiming timing;
+ timing.initialize();
const ResourceLoadTimingInfo& timing_info = info.load_timing;
- if (!timing_info.base_time.is_null()) {
- WebURLLoadTiming timing;
- timing.initialize();
- timing.setRequestTime(timing_info.base_time.ToDoubleT());
- timing.setProxyStart(timing_info.proxy_start);
- timing.setProxyEnd(timing_info.proxy_end);
- timing.setDNSStart(timing_info.dns_start);
- timing.setDNSEnd(timing_info.dns_end);
- timing.setConnectStart(timing_info.connect_start);
- timing.setConnectEnd(timing_info.connect_end);
- timing.setSSLStart(timing_info.ssl_start);
- timing.setSSLEnd(timing_info.ssl_end);
- timing.setSendStart(timing_info.send_start);
- timing.setSendEnd(timing_info.send_end);
- timing.setReceiveHeadersEnd(timing_info.receive_headers_end);
- response->setLoadTiming(timing);
- }
+ timing.setRequestTime(timing_info.base_time.ToDoubleT());
+ timing.setProxyStart(timing_info.proxy_start);
+ timing.setProxyEnd(timing_info.proxy_end);
+ timing.setDNSStart(timing_info.dns_start);
+ timing.setDNSEnd(timing_info.dns_end);
+ timing.setConnectStart(timing_info.connect_start);
+ timing.setConnectEnd(timing_info.connect_end);
+ timing.setSSLStart(timing_info.ssl_start);
+ timing.setSSLEnd(timing_info.ssl_end);
+ timing.setSendStart(timing_info.send_start);
+ timing.setSendEnd(timing_info.send_end);
+ timing.setReceiveHeadersEnd(timing_info.receive_headers_end);
+ response->setLoadTiming(timing);
if (info.devtools_info.get()) {
WebHTTPLoadInfo load_info;