| 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 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 874 UMA_HISTOGRAM_TIMES( | 874 UMA_HISTOGRAM_TIMES( |
| 875 "InterProcessTimeTicks.BrowserBehind_RendererToBrowser", skew); | 875 "InterProcessTimeTicks.BrowserBehind_RendererToBrowser", skew); |
| 876 } else { | 876 } else { |
| 877 UMA_HISTOGRAM_TIMES( | 877 UMA_HISTOGRAM_TIMES( |
| 878 "InterProcessTimeTicks.BrowserAhead_RendererToBrowser", -skew); | 878 "InterProcessTimeTicks.BrowserAhead_RendererToBrowser", -skew); |
| 879 } | 879 } |
| 880 } | 880 } |
| 881 UMA_HISTOGRAM_BOOLEAN( | 881 UMA_HISTOGRAM_BOOLEAN( |
| 882 "InterProcessTimeTicks.IsSkewAdditive_RendererToBrowser", | 882 "InterProcessTimeTicks.IsSkewAdditive_RendererToBrowser", |
| 883 is_skew_additive); | 883 is_skew_additive); |
| 884 |
| 885 frame_tree_node_->navigator()->LogBeforeUnloadTime( |
| 886 renderer_before_unload_start_time, renderer_before_unload_end_time); |
| 884 } | 887 } |
| 885 frame_tree_node_->render_manager()->OnBeforeUnloadACK( | 888 frame_tree_node_->render_manager()->OnBeforeUnloadACK( |
| 886 unload_ack_is_for_cross_site_transition_, proceed, | 889 unload_ack_is_for_cross_site_transition_, proceed, |
| 887 before_unload_end_time); | 890 before_unload_end_time); |
| 888 | 891 |
| 889 // If canceled, notify the delegate to cancel its pending navigation entry. | 892 // If canceled, notify the delegate to cancel its pending navigation entry. |
| 890 if (!proceed) | 893 if (!proceed) |
| 891 render_view_host_->GetDelegate()->DidCancelLoading(); | 894 render_view_host_->GetDelegate()->DidCancelLoading(); |
| 892 } | 895 } |
| 893 | 896 |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1553 // Clear any state if a pending navigation is canceled or preempted. | 1556 // Clear any state if a pending navigation is canceled or preempted. |
| 1554 if (suspended_nav_params_) | 1557 if (suspended_nav_params_) |
| 1555 suspended_nav_params_.reset(); | 1558 suspended_nav_params_.reset(); |
| 1556 | 1559 |
| 1557 TRACE_EVENT_ASYNC_END0("navigation", | 1560 TRACE_EVENT_ASYNC_END0("navigation", |
| 1558 "RenderFrameHostImpl navigation suspended", this); | 1561 "RenderFrameHostImpl navigation suspended", this); |
| 1559 navigations_suspended_ = false; | 1562 navigations_suspended_ = false; |
| 1560 } | 1563 } |
| 1561 | 1564 |
| 1562 } // namespace content | 1565 } // namespace content |
| OLD | NEW |