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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 941113002: Pass FrameTreeNode (not RenderFrameHost) to NavigateToEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix style Created 5 years, 10 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
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3b300b6e4f774eeb75b2580c72714c9d6a11a20d..62deecd922ed2890dd26c19932aac7c34d2c72ea 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1958,6 +1958,8 @@ bool WebContentsImpl::NavigateToPendingEntry(
// Navigate in the FrameTreeNode specified in the pending entry, if any. This
// is currently only used in --site-per-process and tests.
+ // TODO(creis): Remove this method and NavigationEntryImpl::frame_tree_node_id
+ // by using FrameNavigationEntries instead. See https://crbug.com/236848.
NavigationEntryImpl* pending_entry =
NavigationEntryImpl::FromNavigationEntry(controller_.GetPendingEntry());
if (pending_entry->frame_tree_node_id() != -1) {
@@ -1968,8 +1970,7 @@ bool WebContentsImpl::NavigateToPendingEntry(
node = subframe;
}
- return node->navigator()->NavigateToPendingEntry(
- node->current_frame_host(), reload_type);
+ return node->navigator()->NavigateToPendingEntry(node, reload_type);
}
void WebContentsImpl::RenderFrameForInterstitialPageCreated(
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698