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

content/renderer/history_controller.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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 31 matching lines @@
 #include "content/renderer/history_entry.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 
 namespace blink {
 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;
 
 // A guide to history state in the renderer:
 //
 // HistoryController: Owned by RenderView, is the entry point for interacting
 //     with history. Handles most of the operations to modify history state,
 //     navigate to an existing back/forward entry, etc.
 //
 // HistoryEntry: Represents a single entry in the back/forward list,
@@ skipping 41 matching lines @@
 //         HistoryNode 2_1: (WebHistoryItem G (url: bar.com/e))
 //            HistoryNode 2_3: (WebHistoryItem H (url: bar.com/f))
 //         HistoryNode 2_2: (WebHistoryItem E (url: bar.com/c)) *REUSED*
 //
 class CONTENT_EXPORT HistoryController {
  public:
   explicit HistoryController(RenderViewImpl* render_view);
   ~HistoryController();
 
   void GoToEntry(scoped_ptr<HistoryEntry> entry,
+                 scoped_ptr<NavigationParams> navigation_params,
                  blink::WebURLRequest::CachePolicy cache_policy);
 
   void UpdateForCommit(RenderFrameImpl* frame,
                        const blink::WebHistoryItem& item,
                        blink::WebHistoryCommitType commit_type,
                        bool navigation_within_page);
 
   HistoryEntry* GetCurrentEntry();
   blink::WebHistoryItem GetItemForNewChildFrame(RenderFrameImpl* frame) const;
   void RemoveChildrenForRedirect(RenderFrameImpl* frame);
 
  private:
   typedef std::vector<std::pair<blink::WebFrame*, blink::WebHistoryItem> >
       HistoryFrameLoadVector;
   void RecursiveGoToEntry(blink::WebFrame* frame,
                           HistoryFrameLoadVector& sameDocumentLoads,
                           HistoryFrameLoadVector& differentDocumentLoads);
 
   void UpdateForInitialLoadInChildFrame(RenderFrameImpl* frame,
                                         const blink::WebHistoryItem& item);
   void CreateNewBackForwardItem(RenderFrameImpl* frame,
                                 const blink::WebHistoryItem& item,
                                 bool clone_children_of_target);
 
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_HISTORY_CONTROLLER_H_