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 3817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3828 if (render_thread_impl) { // Can be NULL in tests. | 3828 if (render_thread_impl) { // Can be NULL in tests. |
3829 render_thread_impl->histogram_customizer()-> | 3829 render_thread_impl->histogram_customizer()-> |
3830 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), | 3830 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), |
3831 RenderView::GetRenderViewCount()); | 3831 RenderView::GetRenderViewCount()); |
3832 // The scheduler isn't interested in history inert commits unless they | 3832 // The scheduler isn't interested in history inert commits unless they |
3833 // are reloads. | 3833 // are reloads. |
3834 if (commit_type != blink::kWebHistoryInertCommit || | 3834 if (commit_type != blink::kWebHistoryInertCommit || |
3835 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), | 3835 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), |
3836 ui::PAGE_TRANSITION_RELOAD)) { | 3836 ui::PAGE_TRANSITION_RELOAD)) { |
3837 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); | 3837 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); |
| 3838 render_thread_impl->GetRendererScheduler()->OnCommitProvisionalLoad(); |
3838 } | 3839 } |
3839 } | 3840 } |
3840 } | 3841 } |
3841 | 3842 |
3842 // Remember that we've already processed this request, so we don't update | 3843 // Remember that we've already processed this request, so we don't update |
3843 // the session history again. We do this regardless of whether this is | 3844 // the session history again. We do this regardless of whether this is |
3844 // a session history navigation, because if we attempted a session history | 3845 // a session history navigation, because if we attempted a session history |
3845 // navigation without valid HistoryItem state, WebCore will think it is a | 3846 // navigation without valid HistoryItem state, WebCore will think it is a |
3846 // new navigation. | 3847 // new navigation. |
3847 navigation_state->set_request_committed(true); | 3848 navigation_state->set_request_committed(true); |
(...skipping 3230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7078 policy(info.default_policy), | 7079 policy(info.default_policy), |
7079 replaces_current_history_item(info.replaces_current_history_item), | 7080 replaces_current_history_item(info.replaces_current_history_item), |
7080 history_navigation_in_new_child_frame( | 7081 history_navigation_in_new_child_frame( |
7081 info.is_history_navigation_in_new_child_frame), | 7082 info.is_history_navigation_in_new_child_frame), |
7082 client_redirect(info.is_client_redirect), | 7083 client_redirect(info.is_client_redirect), |
7083 cache_disabled(info.is_cache_disabled), | 7084 cache_disabled(info.is_cache_disabled), |
7084 form(info.form), | 7085 form(info.form), |
7085 source_location(info.source_location) {} | 7086 source_location(info.source_location) {} |
7086 | 7087 |
7087 } // namespace content | 7088 } // namespace content |
OLD | NEW |