Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: content/renderer/render_view.cc

Issue 7491096: Fix regression with back-button not working on prerendered and instant pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add a swap Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/common/view_messages.h ('K') | « content/renderer/render_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 972349f99357ff3f7c6cac7319e352f3c04c2599..7dbcd4b0bafb7c81d5008846fb23ab9c786698fe 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -703,6 +703,7 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
#endif
IPC_MESSAGE_HANDLER(ViewMsg_UpdateRemoteAccessClientFirewallTraversal,
OnUpdateRemoteAccessClientFirewallTraversal)
+ IPC_MESSAGE_HANDLER(ViewMsg_ShiftHistory, OnShiftHistory)
// Have the super handle all other messages.
IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message))
IPC_END_MESSAGE_MAP()
@@ -1017,6 +1018,21 @@ void RenderView::OnScrollFocusedEditableNodeIntoView() {
}
}
+void RenderView::OnShiftHistory(int history_length) {
+ DCHECK(history_length >= 0);
+ DCHECK(history_list_length_ == 0 || history_list_length_ == 1);
+ int current_page_id = -1;
+ if (history_list_offset_ >= 0)
+ current_page_id = history_page_ids_[history_list_offset_];
+ int new_history_list_length = history_length + history_list_length_;
+ std::vector<int32> new_history_page_ids_(new_history_list_length, -1);
+ if (current_page_id != -1)
+ new_history_page_ids_[new_history_list_length - 1] = current_page_id;
+ new_history_page_ids_.swap(history_page_ids_);
+ history_list_offset_ = new_history_list_length - 1;
+ history_list_length_ = new_history_list_length;
+}
+
///////////////////////////////////////////////////////////////////////////////
// Tell the embedding application that the URL of the active page has changed
« content/common/view_messages.h ('K') | « content/renderer/render_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698