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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 3641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3652 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); | 3652 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); |
3653 if (render_thread_impl) { // Can be NULL in tests. | 3653 if (render_thread_impl) { // Can be NULL in tests. |
3654 render_thread_impl->histogram_customizer()-> | 3654 render_thread_impl->histogram_customizer()-> |
3655 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), | 3655 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), |
3656 RenderView::GetRenderViewCount()); | 3656 RenderView::GetRenderViewCount()); |
3657 // The scheduler isn't interested in history inert commits unless they | 3657 // The scheduler isn't interested in history inert commits unless they |
3658 // are reloads. | 3658 // are reloads. |
3659 if (commit_type != blink::kWebHistoryInertCommit || | 3659 if (commit_type != blink::kWebHistoryInertCommit || |
3660 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), | 3660 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), |
3661 ui::PAGE_TRANSITION_RELOAD)) { | 3661 ui::PAGE_TRANSITION_RELOAD)) { |
| 3662 // TODO(maxlg): remove OnNavigationStarted and migrate this part into |
| 3663 // OnCommitProvisionalLoad. |
3662 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); | 3664 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); |
| 3665 render_thread_impl->GetRendererScheduler()->OnCommitProvisionalLoad(); |
3663 } | 3666 } |
3664 } | 3667 } |
3665 } | 3668 } |
3666 | 3669 |
3667 // Remember that we've already processed this request, so we don't update | 3670 // Remember that we've already processed this request, so we don't update |
3668 // the session history again. We do this regardless of whether this is | 3671 // the session history again. We do this regardless of whether this is |
3669 // a session history navigation, because if we attempted a session history | 3672 // a session history navigation, because if we attempted a session history |
3670 // navigation without valid HistoryItem state, WebCore will think it is a | 3673 // navigation without valid HistoryItem state, WebCore will think it is a |
3671 // new navigation. | 3674 // new navigation. |
3672 navigation_state->set_request_committed(true); | 3675 navigation_state->set_request_committed(true); |
(...skipping 3109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6782 policy(info.default_policy), | 6785 policy(info.default_policy), |
6783 replaces_current_history_item(info.replaces_current_history_item), | 6786 replaces_current_history_item(info.replaces_current_history_item), |
6784 history_navigation_in_new_child_frame( | 6787 history_navigation_in_new_child_frame( |
6785 info.is_history_navigation_in_new_child_frame), | 6788 info.is_history_navigation_in_new_child_frame), |
6786 client_redirect(info.is_client_redirect), | 6789 client_redirect(info.is_client_redirect), |
6787 cache_disabled(info.is_cache_disabled), | 6790 cache_disabled(info.is_cache_disabled), |
6788 form(info.form), | 6791 form(info.form), |
6789 source_location(info.source_location) {} | 6792 source_location(info.source_location) {} |
6790 | 6793 |
6791 } // namespace content | 6794 } // namespace content |
OLD | NEW |