Use WebFrame::loadRequest for reloads and history navigations

content/renderer/history_controller.cc

 // 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 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 71 matching lines @@
         std::make_pair(main_frame, provisional_entry_->root()));
   }
 
   for (const auto& item : same_document_loads) {
     WebFrame* frame = item.first;
     RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
     if (!render_frame)
       continue;
     render_frame->SetPendingNavigationParams(make_scoped_ptr(
         new NavigationParams(*navigation_params_.get())));
-    frame->loadHistoryItem(item.second,
-                           blink::WebHistorySameDocumentLoad,
-                           cache_policy);
+    WebURLRequest request =
+        frame->RequestFromHistoryItem(item.second, cache_policy);
+    frame->loadRequest(request, WebFrame::WebFrameLoadTypeHistorySameDocument,
+                       item.second);
   }
   for (const auto& item : different_document_loads) {
     WebFrame* frame = item.first;
     RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
     if (!render_frame)
       continue;
     render_frame->SetPendingNavigationParams(make_scoped_ptr(
         new NavigationParams(*navigation_params_.get())));
-    frame->loadHistoryItem(item.second,
-                           blink::WebHistoryDifferentDocumentLoad,
-                           cache_policy);
+    WebURLRequest request =
+        frame->RequestFromHistoryItem(item.second, cache_policy);
+    frame->loadRequest(request, WebFrame::WebFrameLoadTypeBackForward,

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

The old names seemed like a clearer pair to me (SameDocumentLoad vs
DifferentDocumentLoad).

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

I brought back the WebHistoryLoadType following comments by Nate in the other
patch.

+                       item.second);
   }
 }
 
+blink::WebHistoryItem HistoryController::FindItemForFrame(
+    scoped_ptr<HistoryEntry> target_entry,
+    RenderFrameImpl* target_frame,
+    blink::WebURLRequest::CachePolicy cache_policy,
+    blink::WebFrame::WebFrameLoadType* load_type) {
+  HistoryFrameLoadVector same_document_loads;
+  HistoryFrameLoadVector different_document_loads;
+
+  provisional_entry_ = target_entry.Pass();
+
+  WebFrame* main_frame = render_view_->GetMainRenderFrame()->GetWebFrame();
+  if (current_entry_) {
+    RecursiveGoToEntry(main_frame, same_document_loads,

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

I'd like to avoid this if we can.  I'm trying to move RecursiveGoToEntry to the
browser process in the next week or two.

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

Done.

+                       different_document_loads);
+  }
+
+  for (const auto& item : same_document_loads) {
+    WebFrame* frame = item.first;
+    RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
+    if (!render_frame || render_frame != target_frame)
+      continue;
+    *load_type = WebFrame::WebFrameLoadTypeHistorySameDocument;
+    return item.second;
+  }
+  for (const auto& item : different_document_loads) {
+    WebFrame* frame = item.first;
+    RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
+    if (!render_frame || render_frame != target_frame)
+      continue;
+    *load_type = WebFrame::WebFrameLoadTypeBackForward;
+    return item.second;
+  }
+  return blink::WebHistoryItem();
+}
+
 void HistoryController::RecursiveGoToEntry(
     WebFrame* frame,
     HistoryFrameLoadVector& same_document_loads,
     HistoryFrameLoadVector& different_document_loads) {
   DCHECK(provisional_entry_);
   DCHECK(current_entry_);
   RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
   const WebHistoryItem& new_item =
       provisional_entry_->GetItemForFrame(render_frame);
   const WebHistoryItem& old_item =
@@ skipping 100 matching lines @@
   if (!current_entry_) {
     current_entry_.reset(
         new HistoryEntry(new_item, target_frame->GetRoutingID()));
   } else {
     current_entry_.reset(current_entry_->CloneAndReplace(
         new_item, clone_children_of_target, target_frame, render_view_));
   }
 }
 
 }  // namespace content