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

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 839413004: Remove the use of page id from building the commit params. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with fix for site-per-process Created 5 years, 11 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/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index ebd10e9739d85a3dbb38636447002fd1893e0df6..1e273bc423e9d70f740d2e93a4a321d4e477e440 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -507,11 +507,14 @@ void NavigatorImpl::DidNavigate(
if (use_site_per_process) {
// TODO(creis): Until we mirror the frame tree in the subframe's process,
// cross-process subframe navigations happen in a renderer's main frame.
- // Correct the transition type here if we know it is for a subframe.
+ // Correct the transition type here if we know it is for a subframe, but it
+ // doesn't have a subframe transition type.
NavigationEntryImpl* pending_entry =
NavigationEntryImpl::FromNavigationEntry(
controller_->GetPendingEntry());
if (!render_frame_host->frame_tree_node()->IsMainFrame() &&
+ params.transition != ui::PAGE_TRANSITION_AUTO_SUBFRAME &&
+ params.transition != ui::PAGE_TRANSITION_MANUAL_SUBFRAME &&
pending_entry &&
pending_entry->frame_tree_node_id() ==
render_frame_host->frame_tree_node()->frame_tree_node_id()) {
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl_browsertest.cc ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698