Fix regression with back-button not working on prerendered and instant pages.

content/renderer/render_view.cc

 // Copyright (c) 2011 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 685 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_ContextMenuClosed, OnContextMenuClosed)
     // TODO(viettrungluu): Move to a separate message filter.
 #if defined(ENABLE_FLAPPER_HACKS)
     IPC_MESSAGE_HANDLER(PepperMsg_ConnectTcpACK, OnConnectTcpACK)
 #endif
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize)
 #endif
     IPC_MESSAGE_HANDLER(ViewMsg_UpdateRemoteAccessClientFirewallTraversal,
                         OnUpdateRemoteAccessClientFirewallTraversal)
+    IPC_MESSAGE_HANDLER(ViewMsg_OffsetAndPruneHistory,
+                        OnOffsetAndPruneHistory)
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RenderView::OnNavigate(const ViewMsg_Navigate_Params& params) {
   if (!webview())
     return;
 
+  LOG(ERROR) << "OnNavigate."
+             << " rv=" << this
+             << " url=" << params.url.spec()
+             << " history_list_offset_=" << history_list_offset_
+             << " history_list_length_=" << history_list_length_
+             << " params.current_history_list_offset="
+             << params.current_history_list_offset
+             << " params.current_history_list_length="
+             << params.current_history_list_length;
+
   bool is_reload =
       params.navigation_type == ViewMsg_Navigate_Type::RELOAD ||
       params.navigation_type == ViewMsg_Navigate_Type::RELOAD_IGNORING_CACHE;
 
   // If this is a stale back/forward (due to a recent navigation the browser
   // didn't know about), ignore it.
   if (IsBackForwardToStaleEntry(params, is_reload))
     return;
 
   // Swap this renderer back in if necessary.
@@ skipping 112 matching lines @@
 
   // Note: if the history_list_length_ is 0 for a back/forward, we must be
   // restoring from a previous session.  We'll update our state in OnNavigate.
   if (!is_back_forward || history_list_length_ <= 0)
     return false;
 
   DCHECK_EQ(static_cast<int>(history_page_ids_.size()), history_list_length_);
 
   // Check for whether the forward history has been cropped due to a recent
   // navigation the browser didn't know about.
-  if (params.pending_history_list_offset >= history_list_length_)
+  if (params.pending_history_list_offset >= history_list_length_) {
+    LOG(ERROR) << "History Length is cropped."
+               << " rv=" << this
+               << " pending=" << params.pending_history_list_offset
+               << " stored=" << history_list_length_;
     return true;
+  }
 
   // Check for whether this entry has been replaced with a new one.
   int expected_page_id =
       history_page_ids_[params.pending_history_list_offset];
-  if (expected_page_id > 0 && params.page_id != expected_page_id)
+  if (expected_page_id > 0 && params.page_id != expected_page_id) {
+    LOG(ERROR) << "Mismatched page id";
     return true;
+  }
 
   return false;
 }
 
 // Stop loading the current page
 void RenderView::OnStop() {
   if (webview()) {
     WebFrame* main_frame = webview()->mainFrame();
     // Stop the alt error page fetcher. If we let it continue it may complete
     // and cause RenderViewHostManager to swap to this RenderView, even though
@@ skipping 144 matching lines @@
 void RenderView::OnScrollFocusedEditableNodeIntoView() {
   WebKit::WebNode node = GetFocusedNode();
   if (!node.isNull()) {
     if (IsEditableNode(node))
       // TODO(varunjain): Change webkit API to scroll a particular node into
       // view and use that API here instead.
       webview()->scrollFocusedNodeIntoView();
   }
 }
 
+void RenderView::OnOffsetAndPruneHistory(int offset) {
+  LOG(ERROR) << "OnOffsetAndPruneHistory."
+             << " offset=" << offset;
+  int current_page_id = -1;
+  if (history_list_offset_ >= 0) {
+    current_page_id = history_page_ids_[history_list_offset_];
+  }
+
+  // We may have multiple things in the list? Or just one?
+  history_list_offset_ = offset;
+  history_list_length_ = offset + 1;
+  if (history_list_length_ >= 0)
+    history_page_ids_.resize(history_list_length_, -1);
+  history_page_ids_[history_list_offset_] = current_page_id;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 // Tell the embedding application that the URL of the active page has changed
 void RenderView::UpdateURL(WebFrame* frame) {
   WebDataSource* ds = frame->dataSource();
   DCHECK(ds);
 
   const WebURLRequest& request = ds->request();
   const WebURLRequest& original_request = ds->originalRequest();
   const WebURLResponse& response = ds->response();
@@ skipping 193 matching lines @@
   // we are navigating away from.  Otherwise, this is the first navigation, so
   // there is no past session history to record.
   if (page_id_ == -1)
     return;
 
   const WebHistoryItem& item =
       webview()->mainFrame()->previousHistoryItem();
   if (item.isNull())
     return;
 
+  LOG(ERROR) << "Updating session history."
+             << " rv=" << this
+             << " page_id_=" << page_id_;
   Send(new ViewHostMsg_UpdateState(
       routing_id_, page_id_, webkit_glue::HistoryItemToString(item)));
 }
 
 void RenderView::OpenURL(
     const GURL& url, const GURL& referrer, WebNavigationPolicy policy) {
   Send(new ViewHostMsg_OpenURL(
       routing_id_, url, referrer, NavigationPolicyToDisposition(policy)));
 }
 
@@ skipping 1243 matching lines @@
 
     // We bump our Page ID to correspond with the new session history entry.
     page_id_ = next_page_id_++;
 
     // Advance our offset in session history, applying the length limit.  There
     // is now no forward history.
     history_list_offset_++;
     if (history_list_offset_ >= content::kMaxSessionHistoryEntries)
       history_list_offset_ = content::kMaxSessionHistoryEntries - 1;
     history_list_length_ = history_list_offset_ + 1;
+    LOG(ERROR) << "didCommitProvisionalLoad."
+               << " rv=" << this
+               << " page_id_" << page_id_
+               << " history_list_length_=" << history_list_length_;
     history_page_ids_.resize(history_list_length_, -1);
     history_page_ids_[history_list_offset_] = page_id_;
   } else {
     // Inspect the navigation_state on this frame to see if the navigation
     // corresponds to a session history navigation...  Note: |frame| may or
     // may not be the toplevel frame, but for the case of capturing session
     // history, the first committed frame suffices.  We keep track of whether
     // we've seen this commit before so that only capture session history once
     // per navigation.
     //
@@ skipping 1956 matching lines @@
 }
 #endif
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }