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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2023013002: Prevent renderer kills for in-page navigations on subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update tests and fix, clean up. Created 4 years, 6 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 612fc59ff8b283cbb988e42110e7476f96f8107f..43c084df61361a7645cb4837ec10e978168f65b1 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3270,12 +3270,14 @@ void RenderFrameImpl::didCommitProvisionalLoad(
// before updating the current history item.
if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
SendUpdateState();
- current_history_item_ = item;
} else {
render_view_->SendUpdateState();
render_view_->history_controller()->UpdateForCommit(
this, item, commit_type, navigation_state->WasWithinSamePage());
}
+ // Update the current history item for this frame (both in default Chrome and
+ // subframe FrameNavigationEntry modes).
+ current_history_item_ = item;
Charlie Reis 2016/06/03 19:20:36 We used to only keep track of this in FNE-enabled
InternalDocumentStateData* internal_data =
InternalDocumentStateData::FromDocumentState(document_state);

Powered by Google App Engine
This is Rietveld 408576698