Index: content/renderer/history_controller.cc |
diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc |
index f2d3d96d341213eeb0ceda09b3d1aa2d1c9fd9e3..ae01a141ca9f869094cdfa881b688161f1a180e0 100644 |
--- a/content/renderer/history_controller.cc |
+++ b/content/renderer/history_controller.cc |
@@ -38,6 +38,7 @@ |
#include "content/common/navigation_params.h" |
#include "content/renderer/render_frame_impl.h" |
#include "content/renderer/render_view_impl.h" |
+#include "third_party/WebKit/public/web/WebFrameLoadType.h" |
#include "third_party/WebKit/public/web/WebLocalFrame.h" |
using blink::WebFrame; |
@@ -89,9 +90,10 @@ void HistoryController::GoToEntry( |
continue; |
render_frame->SetPendingNavigationParams(make_scoped_ptr( |
new NavigationParams(*navigation_params_.get()))); |
- frame->loadHistoryItem(item.second, |
- blink::WebHistorySameDocumentLoad, |
- cache_policy); |
+ WebURLRequest request = frame->toWebLocalFrame()->requestFromHistoryItem( |
+ item.second, cache_policy); |
+ frame->loadRequest(request, blink::BackForward, item.second, |
+ blink::WebHistorySameDocumentLoad); |
} |
for (const auto& item : different_document_loads) { |
WebFrame* frame = item.first; |
@@ -100,9 +102,10 @@ void HistoryController::GoToEntry( |
continue; |
render_frame->SetPendingNavigationParams(make_scoped_ptr( |
new NavigationParams(*navigation_params_.get()))); |
- frame->loadHistoryItem(item.second, |
- blink::WebHistoryDifferentDocumentLoad, |
- cache_policy); |
+ WebURLRequest request = frame->toWebLocalFrame()->requestFromHistoryItem( |
+ item.second, cache_policy); |
+ frame->loadRequest(request, blink::BackForward, item.second, |
+ blink::WebHistoryDifferentDocumentLoad); |
} |
} |