Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: content/browser/frame_host/navigation_request.cc

Issue 2384833002: Revert of Notify the renderer if a history navigation has no subframe items. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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),
104 frame_tree_node->has_committed_real_load(), 103 frame_tree_node->has_committed_real_load(),
105 controller->GetPendingEntryIndex() == -1, 104 controller->GetPendingEntryIndex() == -1,
106 controller->GetIndexOfEntry(&entry), 105 controller->GetIndexOfEntry(&entry),
107 controller->GetLastCommittedEntryIndex(), 106 controller->GetLastCommittedEntryIndex(),
108 controller->GetEntryCount()), 107 controller->GetEntryCount()),
109 true, &frame_entry, &entry)); 108 true, &frame_entry, &entry));
110 return navigation_request; 109 return navigation_request;
111 } 110 }
112 111
113 // static 112 // static
(...skipping 12 matching lines...) Expand all
126 RequestNavigationParams request_params( 125 RequestNavigationParams request_params(
127 false, // is_overriding_user_agent 126 false, // is_overriding_user_agent
128 std::vector<GURL>(), // redirects 127 std::vector<GURL>(), // redirects
129 false, // can_load_local_resources 128 false, // can_load_local_resources
130 base::Time::Now(), // request_time 129 base::Time::Now(), // request_time
131 PageState(), // page_state 130 PageState(), // page_state
132 -1, // page_id 131 -1, // page_id
133 0, // nav_entry_id 132 0, // nav_entry_id
134 false, // is_same_document_history_load 133 false, // is_same_document_history_load
135 false, // is_history_navigation_in_new_child 134 false, // is_history_navigation_in_new_child
136 false, // has_subtree_history_items
137 frame_tree_node->has_committed_real_load(), 135 frame_tree_node->has_committed_real_load(),
138 false, // intended_as_new_entry 136 false, // intended_as_new_entry
139 -1, // pending_history_list_offset 137 -1, // pending_history_list_offset
140 current_history_list_offset, current_history_list_length, 138 current_history_list_offset, current_history_list_length,
141 false, // is_view_source 139 false, // is_view_source
142 false); // should_clear_history_list 140 false); // should_clear_history_list
143 std::unique_ptr<NavigationRequest> navigation_request( 141 std::unique_ptr<NavigationRequest> navigation_request(
144 new NavigationRequest(frame_tree_node, common_params, begin_params, 142 new NavigationRequest(frame_tree_node, common_params, begin_params,
145 request_params, false, nullptr, nullptr)); 143 request_params, false, nullptr, nullptr));
146 return navigation_request; 144 return navigation_request;
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 458
461 TransferNavigationHandleOwnership(render_frame_host); 459 TransferNavigationHandleOwnership(render_frame_host);
462 render_frame_host->CommitNavigation(response_.get(), std::move(body_), 460 render_frame_host->CommitNavigation(response_.get(), std::move(body_),
463 common_params_, request_params_, 461 common_params_, request_params_,
464 is_view_source_); 462 is_view_source_);
465 463
466 frame_tree_node_->ResetNavigationRequest(true); 464 frame_tree_node_->ResetNavigationRequest(true);
467 } 465 }
468 466
469 } // namespace content 467 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698