Reland #2 Remove the is_loading_ field from WebContentsImpl

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/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 326 matching lines @@
     return false;  // Unable to create the desired RenderFrameHost.
 
   // Make sure no code called via RFHM::Navigate clears the pending entry.
   if (is_pending_entry)
     CHECK_EQ(controller_->GetPendingEntry(), &entry);
 
   // For security, we should never send non-Web-UI URLs to a Web UI renderer.
   // Double check that here.
   CheckWebUIRendererDoesNotDisplayNormalURL(dest_render_frame_host, dest_url);
 
+  // In the case of a transfer navigation, set the destination RenderFrameHost
+  // as loading.  This ensures that the RenderFrameHost gets in a loading state
+  // without emitting a spurrious DidStartLoading notification at the

[Charlie Reis, 2016/02/17 05:15:28]

nit: spurious

[clamy, 2016/02/18 17:20:26]

Done.

+  // FrameTreeNode level (since the FrameTreeNode was already loading). Note
+  // that this works both for a transfer to a different RenderFrameHost and in
+  // the rare case where the navigation is transferred back to the same
+  // RenderFrameHost.
+  bool is_transfer = entry.transferred_global_request_id().child_id != -1;
+  if (is_transfer)
+    dest_render_frame_host->set_is_loading(true);
+
   // Navigate in the desired RenderFrameHost.
   // We can skip this step in the rare case that this is a transfer navigation
   // which began in the chosen RenderFrameHost, since the request has already
   // been issued.  In that case, simply resume the response.
-  bool is_transfer_to_same =
-      entry.transferred_global_request_id().child_id != -1 &&
-      entry.transferred_global_request_id().child_id ==
-          dest_render_frame_host->GetProcess()->GetID();
+  bool is_transfer_to_same = is_transfer &&
+                             entry.transferred_global_request_id().child_id ==
+                                 dest_render_frame_host->GetProcess()->GetID();
   if (!is_transfer_to_same) {
     navigation_data_.reset(new NavigationMetricsData(navigation_start, dest_url,
                                                      entry.restore_type()));
     // Create the navigation parameters.
     FrameMsg_Navigate_Type::Value navigation_type =
         GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
     dest_render_frame_host->Navigate(
         entry.ConstructCommonNavigationParams(dest_url, dest_referrer,
                                               navigation_type, lofi_state,
                                               navigation_start),
         entry.ConstructStartNavigationParams(),
         entry.ConstructRequestNavigationParams(
             frame_entry, is_same_document_history_load,
             frame_tree_node->has_committed_real_load(),
             controller_->GetPendingEntryIndex() == -1,
             controller_->GetIndexOfEntry(&entry),
             controller_->GetLastCommittedEntryIndex(),
             controller_->GetEntryCount()));
   } else {
     // No need to navigate again.  Just resume the deferred request.
+    // Also sets the RenderFrameHost back to a loading state again.

[Charlie Reis, 2016/02/17 05:15:28]

nit: set

Where does that happen?  I don't see any changes to ResumeDeferredNavigation.

[clamy, 2016/02/17 14:42:06]

This remains from a previous version of the patch, my mistake. Will delete it.

     dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
         entry.transferred_global_request_id());
   }
 
   // Make sure no code called via RFH::Navigate clears the pending entry.
   if (is_pending_entry)
     CHECK_EQ(controller_->GetPendingEntry(), &entry);
 
   if (controller_->GetPendingEntryIndex() == -1 &&
       dest_url.SchemeIs(url::kJavaScriptScheme)) {
@@ skipping 658 matching lines @@
       entry->set_should_replace_entry(pending_entry->should_replace_entry());
       entry->SetRedirectChain(pending_entry->GetRedirectChain());
     }
     controller_->SetPendingEntry(std::move(entry));
     if (delegate_)
       delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content