Add item and document sequence numbers to FrameNavigationEntry.

content/browser/frame_host/navigation_controller_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/navigation_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 790 matching lines @@
                      new_type == NAVIGATION_TYPE_EXISTING_PAGE;
   // There are mismatches in the field where the new classifier thinks it's
   // AUTO_SUBFRAME and the old classifier somehow thinks it's NEW or IGNORE. For
   // IGNORE we know of at least one repro (https://crbug.com/492875), and for
   // NEW it's not entirely clear what's going on, but we're pretty sure the new
   // classifier is correct for both cases, so we're letting these mismatches go.
   ignore_mismatch |= details->type == NAVIGATION_TYPE_NEW_SUBFRAME &&
                      new_type == NAVIGATION_TYPE_AUTO_SUBFRAME;
   ignore_mismatch |= details->type == NAVIGATION_TYPE_NAV_IGNORE &&
                      new_type == NAVIGATION_TYPE_AUTO_SUBFRAME;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kSitePerProcess)) {
+  bool is_site_per_process = base::CommandLine::ForCurrentProcess()->HasSwitch(

[Charlie Reis, 2015/06/17 22:56:23]

I'll undo this.  (I was using it below in an earlier version of the patch.)

[Avi (use Gerrit), 2015/06/18 00:57:00]

Acknowledged.

[Charlie Reis, 2015/06/18 20:30:17]

Done.

+      switches::kSitePerProcess);
+  if (is_site_per_process) {
     // We know that the old classifier is wrong for OOPIFs, so use the new one
     // in --site-per-process mode.
     details->type = new_type;
     ignore_mismatch = true;
   }
   if (!ignore_mismatch) {
     DCHECK_EQ(details->type, new_type);
   }
 
   // is_in_page must be computed before the entry gets committed.
@@ skipping 393 matching lines @@
   new_entry->SetReferrer(params.referrer);
   new_entry->SetPageID(params.page_id);
   new_entry->SetTransitionType(params.transition);
   new_entry->set_site_instance(
       static_cast<SiteInstanceImpl*>(rfh->GetSiteInstance()));
   new_entry->SetHasPostData(params.is_post);
   new_entry->SetPostID(params.post_id);
   new_entry->SetOriginalRequestURL(params.original_request_url);
   new_entry->SetIsOverridingUserAgent(params.is_overriding_user_agent);
 
+  // Update the FrameNavigationEntry for new main frame commits.
+  FrameNavigationEntry* frame_entry = new_entry->root_node()->frame_entry.get();
+  frame_entry->set_item_sequence_number(params.item_sequence_number);
+  frame_entry->set_document_sequence_number(params.document_sequence_number);
+
   // history.pushState() is classified as a navigation to a new page, but
   // sets was_within_same_page to true. In this case, we already have the
   // title and favicon available, so set them immediately.
   if (params.was_within_same_page && GetLastCommittedEntry()) {
     new_entry->SetTitle(GetLastCommittedEntry()->GetTitle());
     new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
   }
 
   DCHECK(!params.history_list_was_cleared || !replace_entry);
   // The browser requested to clear the session history when it initiated the
@@ skipping 156 matching lines @@
   // stored in the page state for each of those entries. This happens out of
   // band with the actual navigations.
   DCHECK(GetLastCommittedEntry()) << "ClassifyNavigation should guarantee "
                                   << "that a last committed entry exists.";
 
   NavigationEntryImpl* new_entry = nullptr;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSitePerProcess)) {
     // Make sure new_entry takes ownership of frame_entry in a scoped_refptr.
     FrameNavigationEntry* frame_entry = new FrameNavigationEntry(
-        rfh->frame_tree_node()->frame_tree_node_id(), rfh->GetSiteInstance(),
-        params.url, params.referrer);
+        rfh->frame_tree_node()->frame_tree_node_id(),
+        params.item_sequence_number, params.document_sequence_number,
+        rfh->GetSiteInstance(), params.url, params.referrer);
     new_entry = GetLastCommittedEntry()->CloneAndReplace(rfh->frame_tree_node(),
                                                          frame_entry);
     CHECK(frame_entry->HasOneRef());
   } else {
     new_entry = GetLastCommittedEntry()->Clone();
   }
 
   new_entry->SetPageID(params.page_id);
   InsertOrReplaceEntry(new_entry, false);
 }
@@ skipping 35 matching lines @@
       return true;
     }
   }
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSitePerProcess)) {
     // This may be a "new auto" case where we add a new FrameNavigationEntry, or
     // it may be a "history auto" case where we update an existing one.
     NavigationEntryImpl* last_committed = GetLastCommittedEntry();
     last_committed->AddOrUpdateFrameEntry(rfh->frame_tree_node(),
+                                          params.item_sequence_number,
+                                          params.document_sequence_number,
                                           rfh->GetSiteInstance(), params.url,
                                           params.referrer, params.page_state);
 
     // Cross-process subframe navigations may leave a pending entry around.
     // Clear it if it's actually for the subframe.
     // TODO(creis): Don't use pending entries for subframe navigations.
     // See https://crbug.com/495161.
     if (pending_entry_ &&
         pending_entry_->frame_tree_node_id() ==
             rfh->frame_tree_node()->frame_tree_node_id()) {
@@ skipping 581 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content