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

Unified Diff: content/browser/frame_host/navigation_request.cc

Issue 1415603018: OOPIF: Support session restore by combining/splitting frame states. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up and fix bugs Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 769c8689b1695005ed175547955cd16fcdd0109c..eae6b6558a11410b20db5b28551c10964a8934ff 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -126,19 +126,20 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
// TODO(clamy): The pending history list offset should be properly set.
// TODO(clamy): Set has_committed_real_load.
RequestNavigationParams request_params(
- false, // is_overriding_user_agent
- std::vector<GURL>(), // redirects
- false, // can_load_local_resources
- base::Time::Now(), // request_time
- PageState(), // page_state
- -1, // page_id
- 0, // nav_entry_id
- false, // is_same_document_history_load
- false, // has_committed_real_load
- false, // intended_as_new_entry
- -1, // pending_history_list_offset
+ false, // is_overriding_user_agent
+ std::vector<GURL>(), // redirects
+ false, // can_load_local_resources
+ base::Time::Now(), // request_time
+ PageState(), // page_state
+ ExplodedFrameState(), // frame_state
+ -1, // page_id
+ 0, // nav_entry_id
+ false, // is_same_document_history_load
+ false, // has_committed_real_load
+ false, // intended_as_new_entry
+ -1, // pending_history_list_offset
current_history_list_offset, current_history_list_length,
- false); // should_clear_history_list
+ false); // should_clear_history_list
scoped_ptr<NavigationRequest> navigation_request(
new NavigationRequest(frame_tree_node, common_params, begin_params,
request_params, body, false, nullptr, nullptr));
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/render_frame_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698