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 3803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3814 if (render_thread_impl) { // Can be NULL in tests. | 3814 if (render_thread_impl) { // Can be NULL in tests. |
3815 render_thread_impl->histogram_customizer()-> | 3815 render_thread_impl->histogram_customizer()-> |
3816 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), | 3816 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), |
3817 RenderView::GetRenderViewCount()); | 3817 RenderView::GetRenderViewCount()); |
3818 // The scheduler isn't interested in history inert commits unless they | 3818 // The scheduler isn't interested in history inert commits unless they |
3819 // are reloads. | 3819 // are reloads. |
3820 if (commit_type != blink::kWebHistoryInertCommit || | 3820 if (commit_type != blink::kWebHistoryInertCommit || |
3821 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), | 3821 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), |
3822 ui::PAGE_TRANSITION_RELOAD)) { | 3822 ui::PAGE_TRANSITION_RELOAD)) { |
3823 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); | 3823 render_thread_impl->GetRendererScheduler()->OnNavigationStarted(); |
3824 render_thread_impl->GetRendererScheduler()->OnCommitProvisionalLoad(); | |
Liquan (Max) Gu
2017/05/25 16:34:40
Do you think we should combine the part in OnNavig
tdresser
2017/05/25 19:43:38
I propose we leave it for now, and as a follow up
Liquan (Max) Gu
2017/05/29 23:44:10
Acknowledged.
| |
3824 } | 3825 } |
3825 } | 3826 } |
3826 } | 3827 } |
3827 | 3828 |
3828 // Remember that we've already processed this request, so we don't update | 3829 // Remember that we've already processed this request, so we don't update |
3829 // the session history again. We do this regardless of whether this is | 3830 // the session history again. We do this regardless of whether this is |
3830 // a session history navigation, because if we attempted a session history | 3831 // a session history navigation, because if we attempted a session history |
3831 // navigation without valid HistoryItem state, WebCore will think it is a | 3832 // navigation without valid HistoryItem state, WebCore will think it is a |
3832 // new navigation. | 3833 // new navigation. |
3833 navigation_state->set_request_committed(true); | 3834 navigation_state->set_request_committed(true); |
(...skipping 3221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
7055 policy(info.default_policy), | 7056 policy(info.default_policy), |
7056 replaces_current_history_item(info.replaces_current_history_item), | 7057 replaces_current_history_item(info.replaces_current_history_item), |
7057 history_navigation_in_new_child_frame( | 7058 history_navigation_in_new_child_frame( |
7058 info.is_history_navigation_in_new_child_frame), | 7059 info.is_history_navigation_in_new_child_frame), |
7059 client_redirect(info.is_client_redirect), | 7060 client_redirect(info.is_client_redirect), |
7060 cache_disabled(info.is_cache_disabled), | 7061 cache_disabled(info.is_cache_disabled), |
7061 form(info.form), | 7062 form(info.form), |
7062 source_location(info.source_location) {} | 7063 source_location(info.source_location) {} |
7063 | 7064 |
7064 } // namespace content | 7065 } // namespace content |
OLD | NEW |