Send a subtree of same-process PageStates for back/forward child frames.

content/common/navigation_params.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 208 matching lines @@
 // navigation that is ready to commit.
 struct CONTENT_EXPORT RequestNavigationParams {
   RequestNavigationParams();
   RequestNavigationParams(bool is_overriding_user_agent,
                           const std::vector<GURL>& redirects,
                           bool can_load_local_resources,
                           const PageState& page_state,
                           int nav_entry_id,
                           bool is_same_document_history_load,
                           bool is_history_navigation_in_new_child,
-                          std::map<std::string, bool> subframe_unique_names,
+                          std::map<std::string, PageState> subtree_page_states,
                           bool has_committed_real_load,
                           bool intended_as_new_entry,
                           int pending_history_list_offset,
                           int current_history_list_offset,
                           int current_history_list_length,
                           bool is_view_source,
                           bool should_clear_history_list);
   RequestNavigationParams(const RequestNavigationParams& other);
   ~RequestNavigationParams();
 
@@ skipping 23 matching lines @@
   // For history navigations, this indicates whether the load will stay within
   // the same document.  Defaults to false.
   bool is_same_document_history_load;
 
   // Whether this is a history navigation in a newly created child frame, in
   // which case the browser process is instructing the renderer process to load
   // a URL from a session history item.  Defaults to false.
   bool is_history_navigation_in_new_child;
 
   // If this is a history navigation, this contains a map of frame unique names
-  // to |is_about_blank| for immediate children of the frame being navigated for
-  // which there are history items.  The renderer process only needs to check
-  // with the browser process for newly created subframes that have these unique
-  // names (and only when not staying on about:blank).
-  // TODO(creis): Expand this to a data structure including corresponding
-  // same-process PageStates for the whole subtree in https://crbug.com/639842.
-  std::map<std::string, bool> subframe_unique_names;
+  // to PageStates for all descendants of the frame being navigated that have
+  // history items.  When creating a new subframe during a back/forward
+  // navigation, the renderer can use these PageStates for newly created
+  // subframes.  Note that if the PageState is empty, it corresponds to a
+  // history item that will be loaded in a different process, and thus the
+  // renderer process should ask the browser process to handle it instead.
+  std::map<std::string, PageState> subtree_page_states;
 
   // Whether the frame being navigated has already committed a real page, which
   // affects how new navigations are classified in the renderer process.
   // This currently is only ever set to true in --site-per-process mode.
   // TODO(creis): Create FrameNavigationEntries by default so this always works.
   bool has_committed_real_load;
 
   // For browser-initiated navigations, this is true if this is a new entry
   // being navigated to. This is false otherwise. TODO(avi): Remove this when
   // the pending entry situation is made sane and the browser keeps them around
@@ skipping 57 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_