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()) { |