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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 542603003: Revert "Keep a copy of page id in RenderViewHost." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « content/browser/renderer_host/render_view_host_unittest.cc ('k') | content/renderer/render_view_impl.h » ('j') | 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 baa500a2d3961067443f8a0a01ca631171c6bd89..062c9b1fc502097945d30a044a81d7f9ef055221 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2006,7 +2006,6 @@ void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
std::vector<GURL> redirects;
GetRedirectChain(data_source, &redirects);
if (redirects.size() >= 2) {
- CHECK(!render_view_->page_id_not_yet_reported_);
Send(new FrameHostMsg_DidRedirectProvisionalLoad(
routing_id_,
render_view_->page_id_,
@@ -2156,7 +2155,6 @@ void RenderFrameImpl::didCommitProvisionalLoad(
if (is_new_navigation) {
// We bump our Page ID to correspond with the new session history entry.
render_view_->page_id_ = render_view_->next_page_id_++;
- render_view_->page_id_not_yet_reported_ = true;
// Don't update history_page_ids_ (etc) for kSwappedOutURL, since
// we don't want to forget the entry that was there, and since we will
@@ -2193,7 +2191,6 @@ void RenderFrameImpl::didCommitProvisionalLoad(
!navigation_state->request_committed()) {
// This is a successful session history navigation!
render_view_->page_id_ = navigation_state->pending_page_id();
- render_view_->page_id_not_yet_reported_ = true;
render_view_->history_list_offset_ =
navigation_state->pending_history_list_offset();
@@ -2284,7 +2281,6 @@ void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame,
routing_id_, base::UTF16ToUTF8(title16));
base::string16 shortened_title = title16.substr(0, kMaxTitleChars);
- CHECK(!render_view_->page_id_not_yet_reported_);
Send(new FrameHostMsg_UpdateTitle(routing_id_,
render_view_->page_id_,
shortened_title, direction));
@@ -3371,7 +3367,6 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) {
if (!is_swapped_out())
Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params));
}
- render_view_->page_id_not_yet_reported_ = false;
render_view_->last_page_id_sent_to_browser_ =
std::max(render_view_->last_page_id_sent_to_browser_,
« no previous file with comments | « content/browser/renderer_host/render_view_host_unittest.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698