OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/page_load_metrics/renderer/metrics_render_frame_observer.h" | 5 #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
10 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
57 return; | 57 return; |
58 | 58 |
59 // Make sure to release the sender for a previous navigation, if we have one. | 59 // Make sure to release the sender for a previous navigation, if we have one. |
60 page_timing_metrics_sender_.reset(); | 60 page_timing_metrics_sender_.reset(); |
61 | 61 |
62 // We only create a PageTimingMetricsSender if the page meets the criteria for | 62 // We only create a PageTimingMetricsSender if the page meets the criteria for |
63 // sending and recording metrics. Once page_timing_metrics_sender_ is | 63 // sending and recording metrics. Once page_timing_metrics_sender_ is |
64 // non-null, we will send metrics for the current page at some later time, as | 64 // non-null, we will send metrics for the current page at some later time, as |
65 // those metrics become available. | 65 // those metrics become available. |
66 if (ShouldSendMetrics()) { | 66 if (ShouldSendMetrics()) { |
67 PageLoadTiming timing(GetTiming()); | |
68 DCHECK(!timing.navigation_start.is_null()); | |
Bryan McQuade
2016/04/21 20:50:41
yikes, is this a bug fix? good catch.
Charlie Harrison
2016/04/21 21:09:24
Not quite a bugfix, this bit of code is necessary
| |
67 page_timing_metrics_sender_.reset( | 69 page_timing_metrics_sender_.reset( |
68 new PageTimingMetricsSender(this, routing_id(), CreateTimer())); | 70 new PageTimingMetricsSender(this, routing_id(), CreateTimer(), timing)); |
69 } | 71 } |
70 } | 72 } |
71 | 73 |
72 void MetricsRenderFrameObserver::SendMetrics() { | 74 void MetricsRenderFrameObserver::SendMetrics() { |
73 if (!page_timing_metrics_sender_) | 75 if (!page_timing_metrics_sender_) |
74 return; | 76 return; |
75 if (HasNoRenderFrame()) | 77 if (HasNoRenderFrame()) |
76 return; | 78 return; |
77 PageLoadTiming timing(GetTiming()); | 79 PageLoadTiming timing(GetTiming()); |
78 page_timing_metrics_sender_->Send(timing); | 80 page_timing_metrics_sender_->Send(timing); |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
140 return make_scoped_ptr(new base::OneShotTimer); | 142 return make_scoped_ptr(new base::OneShotTimer); |
141 } | 143 } |
142 | 144 |
143 bool MetricsRenderFrameObserver::HasNoRenderFrame() const { | 145 bool MetricsRenderFrameObserver::HasNoRenderFrame() const { |
144 bool no_frame = !render_frame() || !render_frame()->GetWebFrame(); | 146 bool no_frame = !render_frame() || !render_frame()->GetWebFrame(); |
145 DCHECK(!no_frame); | 147 DCHECK(!no_frame); |
146 return no_frame; | 148 return no_frame; |
147 } | 149 } |
148 | 150 |
149 } // namespace page_load_metrics | 151 } // namespace page_load_metrics |
OLD | NEW |