Source/core/loader/FrameLoader.cpp - Issue 145493005: Keep frames to navigate alive in HistoryController::goToEntry()

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: Source/core/loader/FrameLoader.cpp

Issue 145493005: Keep frames to navigate alive in HistoryController::goToEntry() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: improved as suggested in review Created 6 years, 11 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 | « LayoutTests/fast/loader/remove-iframe-during-history-navigation-same-expected.txt ('k') | Source/core/page/HistoryController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index 06bbce3a01c3016cfc61bb863ccc570c8d8bead5..2cde1869d12bc3b8c92a490f385571c82e80708f 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -1407,9 +1407,6 @@ void FrameLoader::loadHistoryItem(HistoryItem* item, HistoryLoadType historyLoad

{

m_provisionalItem = item;

if (historyLoadType == HistorySameDocumentLoad) {

- // loadInSameDocument() might (indirectly) dispatch events, which could lead to the frame being

- // detached, so protect it.

- RefPtr<Frame> protect(m_frame);

loadInSameDocument(item->url(), item->stateObject(), DoNotUpdateBackForwardList, NotClientRedirect);

restoreScrollPositionAndViewState(ForcedRestoreForSameDocumentHistoryNavigation);

return;