Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/browser/frame_host/render_frame_host_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/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
@@ skipping 984 matching lines @@
           validated_params.page_state)) {
     bad_message::ReceivedBadMessage(
         GetProcess(), bad_message::RFH_CAN_ACCESS_FILES_OF_PAGE_STATE);
     return;
   }
 
   // If the URL does not match what the NavigationHandle expects, treat the
   // commit as a new navigation. This can happen if an ongoing slow
   // same-process navigation is interrupted by a synchronous renderer-initiated
   // navigation.
+  // TODO(csharrison): Data navigations with base URLs get reset here, because
+  // the NavigationHandle tracks the base URL but the validated_params.url track
+  // the data. The trick of saving the old entry ids for these navigations
+  // should go away when this is properly handled.
+  int entry_id_for_data_nav = 0;
   if (navigation_handle_ &&
-      navigation_handle_->GetURL() != validated_params.url) {
+      (navigation_handle_->GetURL() != validated_params.url)) {
+    if (navigation_handle_->GetURL() == validated_params.base_url)

[Charlie Reis, 2016/02/10 00:25:42]

Why even reset the NavHandle in this case?  Creating a new one seems wrong to
me.

[Charlie Harrison, 2016/02/11 20:23:05]

It is wrong, but I think we have to do a more fundamental fix here, rather than
just not deleting these handles. The handle's url is expected to match the
params.url. This gets CHECKed in NavigationHandleImpl::DidCommitNavigation.

I think the handle should track the normal url, not the base url. I think this
happens here:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

I tried sending up a different url in DidStartProvisionalLoad (i.e. the original
url), but many tests failed. Not sure of the best solution here.

+      entry_id_for_data_nav = navigation_handle_->pending_nav_entry_id();
     navigation_handle_.reset();
   }
 
   // Synchronous renderer-initiated navigations will send a
   // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad
   // message.
   if (!navigation_handle_) {
+    // There is no pending NavigationEntry in these cases, so pass 0 as the
+    // nav_id. If the previous handle was a prematurely aborted data nav, then
+    // propagate the entry id.
     navigation_handle_ = NavigationHandleImpl::Create(
-        validated_params.url, frame_tree_node_, base::TimeTicks::Now());
+        validated_params.url, frame_tree_node_, base::TimeTicks::Now(),
+        entry_id_for_data_nav);
   }
 
   accessibility_reset_count_ = 0;
   frame_tree_node()->navigator()->DidNavigate(this, validated_params);
 
   // For a top-level frame, there are potential security concerns associated
   // with displaying graphics from a previously loaded page after the URL in
   // the omnibar has been changed. It is unappealing to clear the page
   // immediately, but if the renderer is taking a long time to issue any
   // compositor output (possibly because of script deliberately creating this
@@ skipping 1527 matching lines @@
   *dst = src;
 
   if (src.routing_id != -1)
     dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
 
   if (src.parent_routing_id != -1)
     dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
 }
 
 }  // namespace content