Use WebFrame::loadRequest for reloads and history navigations

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 23 matching lines @@
 
 #ifndef CONTENT_RENDERER_HISTORY_CONTROLLER_H_
 #define CONTENT_RENDERER_HISTORY_CONTROLLER_H_
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "content/common/content_export.h"
 #include "content/renderer/history_entry.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 
-namespace blink {
-class WebFrame;
-}
-
 namespace content {
 class RenderFrameImpl;
 class RenderViewImpl;
 struct NavigationParams;
 
 // 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.
@@ skipping 46 matching lines @@
 //
 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);
 
+  // Returns the WebHistoryItem corresponding to |target_entry|. If no item is

[Charlie Reis, 2015/05/27 23:34:36]

This sentence doesn't make sense, since a HistoryEntry has a tree of
HistoryItems.  There isn't one WebHistoryItem corresponding to it, unless you're
looking for the one that matches |target_frame|.

If that's the case, it sounds like we might be able to replace this method with
target_entry->GetItemForFrame(target_frame)?

[clamy, 2015/05/29 14:47:01]

Ah I didn't know we had this method. The only thing remaining is to determine if
the history load is a same document load or not, though I can assume it's always
a different document load for the moment in PlzNavigate.

+  // found, then returns an empty WebHistoryItem. Also updates load_type to

[Charlie Reis, 2015/05/27 23:34:36]

nit: |load_type|

I'm not a fan of methods that do multiple things (especially using both return
types and out parameters) if we can avoid it.

[clamy, 2015/05/29 14:47:01]

I'm removing the method in the next patch set.

+  // WebFrameLoadTypeBackForward or WebFrameLoadTypeHistorySameDocument
+  // depending on the type of history navigation.
+  blink::WebHistoryItem FindItemForFrame(

[Charlie Reis, 2015/05/27 23:34:36]

I'd like to avoid adding new code to HistoryController at this point if
possible, especially code that depends on RecursiveGoToEntry.  I'm on the brink
of moving that to the browser process.

[clamy, 2015/05/29 14:47:01]

Done.

+      scoped_ptr<HistoryEntry> target_entry,
+      RenderFrameImpl* target_frame,
+      blink::WebURLRequest::CachePolicy cache_policy,
+      blink::WebFrame::WebFrameLoadType* load_type);
+
   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:
@@ skipping 22 matching lines @@
   // passed into frames created after the commit that resulted from the
   // navigation in GetItemForNewChildFrame().
   scoped_ptr<NavigationParams> navigation_params_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_HISTORY_CONTROLLER_H_