Reland #2 Remove the is_loading_ field from WebContentsImpl

content/renderer/history_controller.cc

 // Copyright 2014 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 42 matching lines @@
 
 HistoryController::HistoryController(RenderViewImpl* render_view)
     : render_view_(render_view) {
   // We don't use HistoryController in OOPIF enabled modes.
   DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries());
 }
 
 HistoryController::~HistoryController() {
 }
 
-void HistoryController::GoToEntry(
+bool HistoryController::GoToEntry(
     blink::WebLocalFrame* main_frame,
     scoped_ptr<HistoryEntry> target_entry,
     scoped_ptr<NavigationParams> navigation_params,
     WebURLRequest::CachePolicy cache_policy) {
   DCHECK(!main_frame->parent());
   HistoryFrameLoadVector same_document_loads;
   HistoryFrameLoadVector different_document_loads;
 
   set_provisional_entry(std::move(target_entry));
   navigation_params_ = std::move(navigation_params);
 
   if (current_entry_) {
     RecursiveGoToEntry(
         main_frame, same_document_loads, different_document_loads);
   }
 
   if (same_document_loads.empty() && different_document_loads.empty()) {
     // If we don't have any frames to navigate at this point, either
     // (1) there is no previous history entry to compare against, or
     // (2) we were unable to match any frames by name. In the first case,
     // doing a different document navigation to the root item is the only valid
     // thing to do. In the second case, we should have been able to find a
     // frame to navigate based on names if this were a same document
     // navigation, so we can safely assume this is the different document case.
     different_document_loads.push_back(
         std::make_pair(main_frame, provisional_entry_->root()));
   }
 
+  bool has_main_frame_request = false;
   for (const auto& item : same_document_loads) {
     WebFrame* frame = item.first;
     RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
     if (!render_frame)
       continue;
     render_frame->SetPendingNavigationParams(make_scoped_ptr(
         new NavigationParams(*navigation_params_.get())));
     WebURLRequest request = frame->toWebLocalFrame()->requestFromHistoryItem(
         item.second, cache_policy);
     frame->toWebLocalFrame()->load(
         request, blink::WebFrameLoadType::BackForward, item.second,
         blink::WebHistorySameDocumentLoad);
+    if (frame == main_frame)
+      has_main_frame_request = true;
   }
   for (const auto& item : different_document_loads) {
     WebFrame* frame = item.first;
     RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
     if (!render_frame)
       continue;
     render_frame->SetPendingNavigationParams(make_scoped_ptr(
         new NavigationParams(*navigation_params_.get())));
     WebURLRequest request = frame->toWebLocalFrame()->requestFromHistoryItem(
         item.second, cache_policy);
     frame->toWebLocalFrame()->load(
         request, blink::WebFrameLoadType::BackForward, item.second,
         blink::WebHistoryDifferentDocumentLoad);
+    if (frame == main_frame)
+      has_main_frame_request = true;
   }
+
+  return has_main_frame_request;
 }
 
 void HistoryController::RecursiveGoToEntry(
     WebFrame* frame,
     HistoryFrameLoadVector& same_document_loads,
     HistoryFrameLoadVector& different_document_loads) {
   DCHECK(provisional_entry_);
   DCHECK(current_entry_);
   RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
   const WebHistoryItem& new_item =
@@ skipping 113 matching lines @@
     bool clone_children_of_target) {
   if (!current_entry_) {
     current_entry_.reset(new HistoryEntry(new_item));
   } else {
     current_entry_.reset(current_entry_->CloneAndReplace(
         new_item, clone_children_of_target, target_frame, render_view_));
   }
 }
 
 }  // namespace content