Source/core/loader/NavigationScheduler.cpp - Issue 1156473002: Refactor FrameLoader loading interface

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/NavigationScheduler.cpp

Issue 1156473002: Refactor FrameLoader loading interface (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed issue with inital history navigation in child frames Created 5 years, 7 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:

Index: Source/core/loader/NavigationScheduler.cpp

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

index 2ac74b8ed38c84b0d4aca49c8d1f9eb81f40c468..98cca6679ec5ce82c4fc2abc227646588222d677 100644

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

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

@@ -177,7 +177,13 @@ public:

virtual void fire(LocalFrame* frame) override

{

OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();

- frame->loader().reload(NormalReload, KURL(), ClientRedirect);

+ if (!frame->loader().currentItem())

+ return;

+ FrameLoadRequest request = FrameLoader::frameRequestForReload(

+ FrameLoader::resourceRequestForReload(

+ frame->loader().currentItem(), *frame, FrameLoadTypeReload, KURL(), ClientRedirect),

+ ClientRedirect);

+ frame->loader().load(request, FrameLoadTypeReload);

}

private: