Do not reset NavigationHandle when navigating same-page

content/browser/frame_host/navigator_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigator_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 493 matching lines @@
                            unique_name.size());
     }
   }
 
   return NavigateToEntry(render_frame_host->frame_tree_node(), *frame_entry,
                          *entry, ReloadType::NONE, false, true, false, nullptr);
 }
 
 void NavigatorImpl::DidNavigate(
     RenderFrameHostImpl* render_frame_host,
-    const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {
+    const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
+    std::unique_ptr<NavigationHandleImpl> navigation_handle) {
   FrameTree* frame_tree = render_frame_host->frame_tree_node()->frame_tree();
   bool oopifs_possible = SiteIsolationPolicy::AreCrossProcessFramesPossible();
 
   bool has_embedded_credentials =
       params.url.has_username() || params.url.has_password();
   UMA_HISTOGRAM_BOOLEAN("Navigation.FrameHasEmbeddedCredentials",
                         has_embedded_credentials);
 
   bool is_navigation_within_page = controller_->IsURLInPageNavigation(
       params.url, params.origin, params.was_within_same_page,
@@ skipping 86 matching lines @@
   // regressing it again.
   // TODO(nasko): Verify the correctness of the above comment, since some of the
   // code doesn't exist anymore. Also, move this code in the
   // PageTransitionIsMainFrame code block above.
   if (ui::PageTransitionIsMainFrame(params.transition) && delegate_)
     delegate_->SetMainFrameMimeType(params.contents_mime_type);
 
   int old_entry_count = controller_->GetEntryCount();
   LoadCommittedDetails details;
   bool did_navigate = controller_->RendererDidNavigate(
-      render_frame_host, params, &details, is_navigation_within_page);
+      render_frame_host, params, &details, is_navigation_within_page,
+      navigation_handle.get());
 
   // If the history length and/or offset changed, update other renderers in the
   // FrameTree.
   if (old_entry_count != controller_->GetEntryCount() ||
       details.previous_entry_index !=
           controller_->GetLastCommittedEntryIndex()) {
     frame_tree->root()->render_manager()->SendPageMessage(
         new PageMsg_SetHistoryOffsetAndLength(
             MSG_ROUTING_NONE, controller_->GetLastCommittedEntryIndex(),
             controller_->GetEntryCount()),
@@ skipping 28 matching lines @@
     if (did_navigate &&
         (controller_->GetLastCommittedEntry()->GetTransitionType() &
             ui::PAGE_TRANSITION_FORWARD_BACK)) {
       transition_type = ui::PageTransitionFromInt(
           params.transition | ui::PAGE_TRANSITION_FORWARD_BACK);
     }
 
     delegate_->DidCommitProvisionalLoad(render_frame_host,
                                         params.url,
                                         transition_type);
-    render_frame_host->navigation_handle()->DidCommitNavigation(
-        params, is_navigation_within_page, render_frame_host);
-    render_frame_host->SetNavigationHandle(nullptr);

[Charlie Reis, 2016/11/03 22:02:22]

Sanity check: This is handled by FindNavigationHandleForCommit now, right?

[clamy, 2016/11/04 14:18:21]

Yes in the cases where we need to reset it. FindNavigationHandleForCommit will
transfer ownership of the NavigationHandle to use for commit to this function.

+    navigation_handle->DidCommitNavigation(params, is_navigation_within_page,
+                                           render_frame_host);
+    navigation_handle.reset();
   }
 
   if (!did_navigate)
     return;  // No navigation happened.
 
   // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen
   // for the appropriate notification (best) or you can add it to
   // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if
   // necessary, please).
 
@@ skipping 578 matching lines @@
     if (navigation_handle)
       navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
 
     controller_->SetPendingEntry(std::move(entry));
     if (delegate_)
       delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content