OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 UMA_HISTOGRAM_TIMES( | 868 UMA_HISTOGRAM_TIMES( |
869 "InterProcessTimeTicks.BrowserBehind_RendererToBrowser", skew); | 869 "InterProcessTimeTicks.BrowserBehind_RendererToBrowser", skew); |
870 } else { | 870 } else { |
871 UMA_HISTOGRAM_TIMES( | 871 UMA_HISTOGRAM_TIMES( |
872 "InterProcessTimeTicks.BrowserAhead_RendererToBrowser", -skew); | 872 "InterProcessTimeTicks.BrowserAhead_RendererToBrowser", -skew); |
873 } | 873 } |
874 } | 874 } |
875 UMA_HISTOGRAM_BOOLEAN( | 875 UMA_HISTOGRAM_BOOLEAN( |
876 "InterProcessTimeTicks.IsSkewAdditive_RendererToBrowser", | 876 "InterProcessTimeTicks.IsSkewAdditive_RendererToBrowser", |
877 is_skew_additive); | 877 is_skew_additive); |
| 878 |
| 879 frame_tree_node_->navigator()->LogBeforeUnloadTime( |
| 880 renderer_before_unload_start_time, renderer_before_unload_end_time); |
878 } | 881 } |
879 frame_tree_node_->render_manager()->OnBeforeUnloadACK( | 882 frame_tree_node_->render_manager()->OnBeforeUnloadACK( |
880 unload_ack_is_for_cross_site_transition_, proceed, | 883 unload_ack_is_for_cross_site_transition_, proceed, |
881 before_unload_end_time); | 884 before_unload_end_time); |
882 | 885 |
883 // If canceled, notify the delegate to cancel its pending navigation entry. | 886 // If canceled, notify the delegate to cancel its pending navigation entry. |
884 if (!proceed) | 887 if (!proceed) |
885 render_view_host_->GetDelegate()->DidCancelLoading(); | 888 render_view_host_->GetDelegate()->DidCancelLoading(); |
886 } | 889 } |
887 | 890 |
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1541 // Clear any state if a pending navigation is canceled or preempted. | 1544 // Clear any state if a pending navigation is canceled or preempted. |
1542 if (suspended_nav_params_) | 1545 if (suspended_nav_params_) |
1543 suspended_nav_params_.reset(); | 1546 suspended_nav_params_.reset(); |
1544 | 1547 |
1545 TRACE_EVENT_ASYNC_END0("navigation", | 1548 TRACE_EVENT_ASYNC_END0("navigation", |
1546 "RenderFrameHostImpl navigation suspended", this); | 1549 "RenderFrameHostImpl navigation suspended", this); |
1547 navigations_suspended_ = false; | 1550 navigations_suspended_ = false; |
1548 } | 1551 } |
1549 | 1552 |
1550 } // namespace content | 1553 } // namespace content |
OLD | NEW |