Move provisional navigation parameters to RenderFrame, and use the HistoryController to distribute …

content/renderer/history_controller.h

Index: content/renderer/history_controller.h
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h
index 97969318aff16af20915eaa03c3f760d006bb9ef..d2afc6aa85691f0dc12c89b517df4ca1653c57b4 100644
--- a/content/renderer/history_controller.h
+++ b/content/renderer/history_controller.h
@@ -49,6 +49,7 @@ class WebFrame;
 }
 
 namespace content {
+struct NavigationParams;

[Charlie Reis, 2015/03/23 22:23:01]

Style nit: Classes before structs.

[Avi (use Gerrit), 2015/03/24 20:33:46]

I've seen it both ways, and written it both ways, but I don't really care.

Done.

 class RenderFrameImpl;
 class RenderViewImpl;
 
@@ -110,6 +111,7 @@ class CONTENT_EXPORT HistoryController {
   ~HistoryController();
 
   void GoToEntry(scoped_ptr<HistoryEntry> entry,
+                 scoped_ptr<NavigationParams> navigation_params,
                  blink::WebURLRequest::CachePolicy cache_policy);
 
   void UpdateForCommit(RenderFrameImpl* frame,
@@ -136,8 +138,14 @@ class CONTENT_EXPORT HistoryController {
 
   RenderViewImpl* render_view_;
 
+  // A HistoryEntry representing the currently-loaded page.
   scoped_ptr<HistoryEntry> current_entry_;
+  // A HistoryEntry representing the page that is being loaded, or an empty
+  // scoped_ptr if no page is being loaded.
   scoped_ptr<HistoryEntry> provisional_entry_;
+  // The NavigationParams corresponding to the last load that was initiated by
+  // |GoToEntry|.

[Charlie Reis, 2015/03/23 22:23:02]

Let's mention that this is passed to each RenderFrame that does a load from the
provisional_entry_, and why that's needed.

[Avi (use Gerrit), 2015/03/24 20:33:46]

That' actually not the case; by the time GetItemForNewChildFrame is called,
there is no provisional_entry_ any more, and info is pulled from current_entry_.
Rephrasing in any case. 

[Charlie Reis, 2015/03/24 22:04:08]

Acknowledged.

+  scoped_ptr<NavigationParams> navigation_params_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryController);
 };