Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1135)

Unified Diff: content/renderer/history_controller.cc

Issue 1199313006: Disable support for swapped out RenderFrame(Host) on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/history_controller.cc
diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc
index 0eb220b57322c61fffc2573cb275ac2291b562d9..c695efb4a5c497c91ef6367e7fe7a56d5b3250f0 100644
--- a/content/renderer/history_controller.cc
+++ b/content/renderer/history_controller.cc
@@ -56,16 +56,17 @@ HistoryController::~HistoryController() {
}
void HistoryController::GoToEntry(
+ blink::WebLocalFrame* main_frame,
scoped_ptr<HistoryEntry> target_entry,
scoped_ptr<NavigationParams> navigation_params,
WebURLRequest::CachePolicy cache_policy) {
+ DCHECK(!main_frame->parent());
HistoryFrameLoadVector same_document_loads;
HistoryFrameLoadVector different_document_loads;
set_provisional_entry(target_entry.Pass());
navigation_params_ = navigation_params.Pass();
- WebFrame* main_frame = render_view_->GetMainRenderFrame()->GetWebFrame();
if (current_entry_) {
RecursiveGoToEntry(
main_frame, same_document_loads, different_document_loads);

Powered by Google App Engine
This is Rietveld 408576698