| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 frame_entry, request_body, dest_url, dest_referrer, | 93 frame_entry, request_body, dest_url, dest_referrer, |
| 94 navigation_type, lofi_state, navigation_start), | 94 navigation_type, lofi_state, navigation_start), |
| 95 BeginNavigationParams(headers.ToString(), | 95 BeginNavigationParams(headers.ToString(), |
| 96 LoadFlagFromNavigationType(navigation_type), | 96 LoadFlagFromNavigationType(navigation_type), |
| 97 false, // has_user_gestures | 97 false, // has_user_gestures |
| 98 false, // skip_service_worker | 98 false, // skip_service_worker |
| 99 REQUEST_CONTEXT_TYPE_LOCATION), | 99 REQUEST_CONTEXT_TYPE_LOCATION), |
| 100 entry.ConstructRequestNavigationParams( | 100 entry.ConstructRequestNavigationParams( |
| 101 frame_entry, is_same_document_history_load, | 101 frame_entry, is_same_document_history_load, |
| 102 is_history_navigation_in_new_child, | 102 is_history_navigation_in_new_child, |
| 103 entry.HasSubtreeHistoryItems(frame_tree_node), |
| 103 frame_tree_node->has_committed_real_load(), | 104 frame_tree_node->has_committed_real_load(), |
| 104 controller->GetPendingEntryIndex() == -1, | 105 controller->GetPendingEntryIndex() == -1, |
| 105 controller->GetIndexOfEntry(&entry), | 106 controller->GetIndexOfEntry(&entry), |
| 106 controller->GetLastCommittedEntryIndex(), | 107 controller->GetLastCommittedEntryIndex(), |
| 107 controller->GetEntryCount()), | 108 controller->GetEntryCount()), |
| 108 true, &frame_entry, &entry)); | 109 true, &frame_entry, &entry)); |
| 109 return navigation_request; | 110 return navigation_request; |
| 110 } | 111 } |
| 111 | 112 |
| 112 // static | 113 // static |
| (...skipping 12 matching lines...) Expand all Loading... |
| 125 RequestNavigationParams request_params( | 126 RequestNavigationParams request_params( |
| 126 false, // is_overriding_user_agent | 127 false, // is_overriding_user_agent |
| 127 std::vector<GURL>(), // redirects | 128 std::vector<GURL>(), // redirects |
| 128 false, // can_load_local_resources | 129 false, // can_load_local_resources |
| 129 base::Time::Now(), // request_time | 130 base::Time::Now(), // request_time |
| 130 PageState(), // page_state | 131 PageState(), // page_state |
| 131 -1, // page_id | 132 -1, // page_id |
| 132 0, // nav_entry_id | 133 0, // nav_entry_id |
| 133 false, // is_same_document_history_load | 134 false, // is_same_document_history_load |
| 134 false, // is_history_navigation_in_new_child | 135 false, // is_history_navigation_in_new_child |
| 136 false, // has_subtree_history_items |
| 135 frame_tree_node->has_committed_real_load(), | 137 frame_tree_node->has_committed_real_load(), |
| 136 false, // intended_as_new_entry | 138 false, // intended_as_new_entry |
| 137 -1, // pending_history_list_offset | 139 -1, // pending_history_list_offset |
| 138 current_history_list_offset, current_history_list_length, | 140 current_history_list_offset, current_history_list_length, |
| 139 false, // is_view_source | 141 false, // is_view_source |
| 140 false); // should_clear_history_list | 142 false); // should_clear_history_list |
| 141 std::unique_ptr<NavigationRequest> navigation_request( | 143 std::unique_ptr<NavigationRequest> navigation_request( |
| 142 new NavigationRequest(frame_tree_node, common_params, begin_params, | 144 new NavigationRequest(frame_tree_node, common_params, begin_params, |
| 143 request_params, false, nullptr, nullptr)); | 145 request_params, false, nullptr, nullptr)); |
| 144 return navigation_request; | 146 return navigation_request; |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 | 460 |
| 459 TransferNavigationHandleOwnership(render_frame_host); | 461 TransferNavigationHandleOwnership(render_frame_host); |
| 460 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 462 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 461 common_params_, request_params_, | 463 common_params_, request_params_, |
| 462 is_view_source_); | 464 is_view_source_); |
| 463 | 465 |
| 464 frame_tree_node_->ResetNavigationRequest(true); | 466 frame_tree_node_->ResetNavigationRequest(true); |
| 465 } | 467 } |
| 466 | 468 |
| 467 } // namespace content | 469 } // namespace content |
| OLD | NEW |