content/renderer/history_entry.cc - Issue 2023013002: Prevent renderer kills for in-page navigations on subframes.

Unified Diff: content/renderer/history_entry.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/history_entry.cc

diff --git a/content/renderer/history_entry.cc b/content/renderer/history_entry.cc

index 8a2d20de95bab7d222c077ba70c017a508ee583c..4b6766fed8b55f7b06333251bf551627549a24b2 100644

--- a/content/renderer/history_entry.cc

+++ b/content/renderer/history_entry.cc

@@ -64,9 +64,10 @@ HistoryEntry::HistoryNode* HistoryEntry::HistoryNode::CloneAndReplace(

const WebHistoryItem& item_for_create = is_target_frame ? new_item : item_;

HistoryNode* new_history_node = new HistoryNode(new_entry, item_for_create);

- if (is_target_frame && clone_children_of_target && !item_.isNull()) {

+ if (is_target_frame && clone_children_of_target &&

+ !current_frame->current_history_item().isNull()) {

new_history_node->item().setDocumentSequenceNumber(

- item_.documentSequenceNumber());

+ current_frame->current_history_item().documentSequenceNumber());

Charlie Reis 2016/06/03 19:20:36 This fixes BackToAboutBlankIframe and BackToIframe

Avi (use Gerrit) 2016/06/03 20:26:57 Pull out |current_frame->current_history_item()| w

Charlie Reis 2016/06/03 20:53:28 Done.

}

// TODO(creis): This needs to be updated to handle HistoryEntry in

« content/renderer/history_controller.cc ('K') | « content/renderer/history_controller.cc ('k') | content/renderer/render_frame_impl.h » ('j') | content/renderer/render_frame_impl.cc » ('J')