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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« content/browser/frame_host/navigation_controller_impl_browsertest.cc ('K') | « content/browser/frame_host/navigation_controller_impl_browsertest.cc ('k') | content/renderer/history_entry.cc » ('j') | content/renderer/history_entry.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/history_controller.cc

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

index ddd187853be623ef5d15238c56eb3b139108b7ce..057e6d25e9004f0ea2c9a8637c7cda35ee5c4318 100644

--- a/content/renderer/history_controller.cc

+++ b/content/renderer/history_controller.cc

@@ -135,8 +135,7 @@ void HistoryController::RecursiveGoToEntry(

RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);

const WebHistoryItem& new_item =

provisional_entry_->GetItemForFrame(render_frame);

- const WebHistoryItem& old_item =

- current_entry_->GetItemForFrame(render_frame);

+ const WebHistoryItem& old_item = render_frame->current_history_item();

Charlie Reis 2016/06/03 19:20:35 This fixes BackTwiceToIframeWithContent in default

Avi (use Gerrit) 2016/06/03 20:26:57 Agreed that this is a fix; is a comment appropriat

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

if (new_item.isNull())

return;