DRAFT CL: Add FrameNavigationEntry and track subframe session histories.

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 2018 matching lines @@
 
 bool WebContentsImpl::Send(IPC::Message* message) {
   if (!GetRenderViewHost()) {
     delete message;
     return false;
   }
 
   return GetRenderViewHost()->Send(message);
 }
 
-bool WebContentsImpl::NavigateToPendingEntry(
-    NavigationController::ReloadType reload_type) {
-  FrameTreeNode* node = frame_tree_.root();
-
-  // Navigate in the FrameTreeNode specified in the pending entry, if any.  This
-  // is currently only used in --site-per-process and tests.
-  // TODO(creis): Remove this method and NavigationEntryImpl::frame_tree_node_id
-  // by using FrameNavigationEntries instead.  See https://crbug.com/236848.
-  NavigationEntryImpl* pending_entry = controller_.GetPendingEntry();
-  if (pending_entry->frame_tree_node_id() != -1) {
-    FrameTreeNode* subframe =
-        frame_tree_.FindByID(pending_entry->frame_tree_node_id());
-    DCHECK(subframe);
-    if (subframe)
-      node = subframe;
-  }
-
-  return node->navigator()->NavigateToPendingEntry(node, reload_type);
-}
-
 void WebContentsImpl::RenderFrameForInterstitialPageCreated(
     RenderFrameHost* render_frame_host) {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     RenderFrameForInterstitialPageCreated(render_frame_host));
 }
 
 void WebContentsImpl::AttachInterstitialPage(
     InterstitialPageImpl* interstitial_page) {
   DCHECK(interstitial_page);
   GetRenderManager()->set_interstitial_page(interstitial_page);
@@ skipping 555 matching lines @@
   if (entry && entry->GetURL() == GURL(url::kAboutBlankURL))
     return true;
   return delegate_ && delegate_->ShouldFocusLocationBarByDefault(this);
 }
 
 void WebContentsImpl::SetFocusToLocationBar(bool select_all) {
   if (delegate_)
     delegate_->SetFocusToLocationBar(select_all);
 }
 
+FrameTreeNode* WebContentsImpl::GetFrameTreeRoot() {
+  return frame_tree_.root();
+}
+
 void WebContentsImpl::DidStartProvisionalLoad(
     RenderFrameHostImpl* render_frame_host,
     const GURL& validated_url,
     bool is_error_page,
     bool is_iframe_srcdoc) {
   // Notify observers about the start of the provisional load.
   FOR_EACH_OBSERVER(
       WebContentsObserver,
       observers_,
       DidStartProvisionalLoadForFrame(
@@ skipping 1217 matching lines @@
   // have FrameNavigationEntries.  Once we do, this should be a DCHECK.
   if (rvh->GetDelegate()->GetAsWebContents() != this)
     return;
 
   // We must be prepared to handle state updates for any page, these occur
   // when the user is scrolling and entering form data, as well as when we're
   // leaving a page, in which case our state may have already been moved to
   // the next page. The navigation controller will look up the appropriate
   // NavigationEntry and update it when it is notified via the delegate.
 
-  int entry_index = controller_.GetEntryIndexWithPageID(
-      rvh->GetSiteInstance(), page_id);
+  int entry_index = controller_.GetEntryIndexWithPageID(page_id);
   if (entry_index < 0)
     return;
   NavigationEntry* entry = controller_.GetEntryAtIndex(entry_index);
 
   if (page_state == entry->GetPageState())
     return;  // Nothing to update.
   entry->SetPageState(page_state);
   controller_.NotifyEntryChanged(entry, entry_index);
 }
 
@@ skipping 155 matching lines @@
                                   const base::string16& title,
                                   base::i18n::TextDirection title_direction) {
   RenderViewHost* rvh = render_frame_host->GetRenderViewHost();
 
   // If we have a title, that's a pretty good indication that we've started
   // getting useful data.
   SetNotWaitingForResponse();
 
   // Try to find the navigation entry, which might not be the current one.
   // For example, it might be from a pending RVH for the pending entry.
-  NavigationEntryImpl* entry = controller_.GetEntryWithPageID(
-      rvh->GetSiteInstance(), page_id);
+  NavigationEntryImpl* entry = controller_.GetEntryWithPageID(page_id);
 
   // We can handle title updates when we don't have an entry in
   // UpdateTitleForEntry, but only if the update is from the current RVH.
   // TODO(avi): Change to make decisions based on the RenderFrameHost.
   if (!entry && rvh != GetRenderViewHost())
     return;
 
   // TODO(evan): make use of title_direction.
   // http://code.google.com/p/chromium/issues/detail?id=27094
   if (!UpdateTitleForEntry(entry, title))
@@ skipping 587 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content