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

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: Addressed comments 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:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/NavigationScheduler.cpp
diff --git a/Source/core/loader/NavigationScheduler.cpp b/Source/core/loader/NavigationScheduler.cpp
index 2ac74b8ed38c84b0d4aca49c8d1f9eb81f40c468..e29776ee0e191871ee7b8532a4faf7993c44e857 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())
Nate Chapin 2015/06/02 17:19:35 Null check the ResourceRequest instead of the curr
clamy 2015/06/03 14:39:14 Done.
+ return;
+ FrameLoadRequest request = FrameLoader::frameRequestForReload(
+ frame->loader().resourceRequestForReload(
+ *frame, FrameLoadTypeReload, KURL(), ClientRedirect),
+ ClientRedirect);
+ frame->loader().load(request, FrameLoadTypeReload);
}
private:

Powered by Google App Engine
This is Rietveld 408576698