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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1131183004: Replace page id for updating the history offset. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e6d0ad28a3e28278359523009c886de4eb2a51c9..3a32175d66cf0d3506cbf27a49854c0ad00a3a70 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2703,18 +2703,14 @@ void RenderFrameImpl::didCommitProvisionalLoad(
} else {
const RequestNavigationParams& request_params =
navigation_state->request_params();
- if (request_params.page_id != -1) {
+ if (request_params.nav_entry_id != 0 &&
+ !request_params.intended_as_new_entry) {
// This is a successful session history navigation!
render_view_->page_id_ = request_params.page_id;
render_view_->history_list_offset_ =
request_params.pending_history_list_offset;
}
- // Page id is going away (http://crbug.com/369661); ensure that a
- // replacement that doesn't use page id is equivalent in all cases.
- CHECK_EQ(request_params.page_id != -1,
- request_params.nav_entry_id != 0 &&
- !request_params.intended_as_new_entry);
}
bool sent = Send(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698