diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 15:31:37 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 15:31:37 +0000 |
commit | 04861380a3ed9a75c46716e4119bf2aa55243f0f (patch) | |
tree | 1be93fe712d24321aed3ffdb67596016a6af774e /chrome/browser/net/load_timing_observer.cc | |
parent | 0a8f97d33bd031e8b2b4ca6e83cd1cbf5b9f99de (diff) | |
download | chromium_src-04861380a3ed9a75c46716e4119bf2aa55243f0f.zip chromium_src-04861380a3ed9a75c46716e4119bf2aa55243f0f.tar.gz chromium_src-04861380a3ed9a75c46716e4119bf2aa55243f0f.tar.bz2 |
DevTools: Invalid SSL and DNS timing is reported for non-SSL results or results with no lookup.
BUG=80165
Review URL: http://codereview.chromium.org/6881103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/load_timing_observer.cc')
-rw-r--r-- | chrome/browser/net/load_timing_observer.cc | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc index 7897069..e891075 100644 --- a/chrome/browser/net/load_timing_observer.cc +++ b/chrome/browser/net/load_timing_observer.cc @@ -180,15 +180,22 @@ void LoadTimingObserver::OnAddURLRequestEntry( http_stream_job_to_record_.find(http_stream_job_id); if (it == http_stream_job_to_record_.end()) return; - timing.connect_start = TimeTicksToOffset(it->second.connect_start, - record); - timing.connect_end = TimeTicksToOffset(it->second.connect_end, record); - timing.dns_start = TimeTicksToOffset(it->second.dns_start, record); - timing.dns_end = TimeTicksToOffset(it->second.dns_end, record); + if (!it->second.connect_start.is_null()) { + timing.connect_start = TimeTicksToOffset(it->second.connect_start, + record); + } + if (!it->second.connect_end.is_null()) + timing.connect_end = TimeTicksToOffset(it->second.connect_end, record); + if (!it->second.dns_start.is_null()) + timing.dns_start = TimeTicksToOffset(it->second.dns_start, record); + if (!it->second.dns_end.is_null()) + timing.dns_end = TimeTicksToOffset(it->second.dns_end, record); + if (!it->second.ssl_start.is_null()) + timing.ssl_start = TimeTicksToOffset(it->second.ssl_start, record); + if (!it->second.ssl_end.is_null()) + timing.ssl_end = TimeTicksToOffset(it->second.ssl_end, record); record->socket_reused = it->second.socket_reused; record->socket_log_id = it->second.socket_log_id; - timing.ssl_start = TimeTicksToOffset(it->second.ssl_start, record); - timing.ssl_end = TimeTicksToOffset(it->second.ssl_end, record); break; } case net::NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST: |