OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/navigation_request.h" | 5 #include "content/browser/frame_host/navigation_request.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" | 9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" |
10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 frame_tree_node, entry.ConstructCommonNavigationParams( | 130 frame_tree_node, entry.ConstructCommonNavigationParams( |
131 frame_entry, request_body, dest_url, dest_referrer, | 131 frame_entry, request_body, dest_url, dest_referrer, |
132 navigation_type, lofi_state, navigation_start), | 132 navigation_type, lofi_state, navigation_start), |
133 BeginNavigationParams(headers.ToString(), net::LOAD_NORMAL, | 133 BeginNavigationParams(headers.ToString(), net::LOAD_NORMAL, |
134 false, // has_user_gestures | 134 false, // has_user_gestures |
135 false, // skip_service_worker | 135 false, // skip_service_worker |
136 REQUEST_CONTEXT_TYPE_LOCATION), | 136 REQUEST_CONTEXT_TYPE_LOCATION), |
137 entry.ConstructRequestNavigationParams( | 137 entry.ConstructRequestNavigationParams( |
138 frame_entry, is_same_document_history_load, | 138 frame_entry, is_same_document_history_load, |
139 is_history_navigation_in_new_child, | 139 is_history_navigation_in_new_child, |
| 140 entry.HasSubtreeHistoryItems(frame_tree_node), |
140 frame_tree_node->has_committed_real_load(), | 141 frame_tree_node->has_committed_real_load(), |
141 controller->GetPendingEntryIndex() == -1, | 142 controller->GetPendingEntryIndex() == -1, |
142 controller->GetIndexOfEntry(&entry), | 143 controller->GetIndexOfEntry(&entry), |
143 controller->GetLastCommittedEntryIndex(), | 144 controller->GetLastCommittedEntryIndex(), |
144 controller->GetEntryCount()), | 145 controller->GetEntryCount()), |
145 true, &frame_entry, &entry)); | 146 true, &frame_entry, &entry)); |
146 return navigation_request; | 147 return navigation_request; |
147 } | 148 } |
148 | 149 |
149 // static | 150 // static |
(...skipping 12 matching lines...) Expand all Loading... |
162 RequestNavigationParams request_params( | 163 RequestNavigationParams request_params( |
163 false, // is_overriding_user_agent | 164 false, // is_overriding_user_agent |
164 std::vector<GURL>(), // redirects | 165 std::vector<GURL>(), // redirects |
165 false, // can_load_local_resources | 166 false, // can_load_local_resources |
166 base::Time::Now(), // request_time | 167 base::Time::Now(), // request_time |
167 PageState(), // page_state | 168 PageState(), // page_state |
168 -1, // page_id | 169 -1, // page_id |
169 0, // nav_entry_id | 170 0, // nav_entry_id |
170 false, // is_same_document_history_load | 171 false, // is_same_document_history_load |
171 false, // is_history_navigation_in_new_child | 172 false, // is_history_navigation_in_new_child |
| 173 false, // has_subtree_history_items |
172 frame_tree_node->has_committed_real_load(), | 174 frame_tree_node->has_committed_real_load(), |
173 false, // intended_as_new_entry | 175 false, // intended_as_new_entry |
174 -1, // pending_history_list_offset | 176 -1, // pending_history_list_offset |
175 current_history_list_offset, current_history_list_length, | 177 current_history_list_offset, current_history_list_length, |
176 false, // is_view_source | 178 false, // is_view_source |
177 false); // should_clear_history_list | 179 false); // should_clear_history_list |
178 std::unique_ptr<NavigationRequest> navigation_request( | 180 std::unique_ptr<NavigationRequest> navigation_request( |
179 new NavigationRequest(frame_tree_node, common_params, begin_params, | 181 new NavigationRequest(frame_tree_node, common_params, begin_params, |
180 request_params, false, nullptr, nullptr)); | 182 request_params, false, nullptr, nullptr)); |
181 return navigation_request; | 183 return navigation_request; |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 | 517 |
516 TransferNavigationHandleOwnership(render_frame_host); | 518 TransferNavigationHandleOwnership(render_frame_host); |
517 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 519 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
518 common_params_, request_params_, | 520 common_params_, request_params_, |
519 is_view_source_); | 521 is_view_source_); |
520 | 522 |
521 frame_tree_node_->ResetNavigationRequest(true); | 523 frame_tree_node_->ResetNavigationRequest(true); |
522 } | 524 } |
523 | 525 |
524 } // namespace content | 526 } // namespace content |
OLD | NEW |