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

Unified Diff: Source/core/frame/LocalFrame.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/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index f5a0e0366599c39e4b4a3ddcb51b16f1987cdc8a..1ee17fb47a82b66edad1cc260762b707e0735270 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -255,10 +255,18 @@ void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa
void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRedirectPolicy)
{
ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalReload);
- if (clientRedirectPolicy == NotClientRedirect)
- m_loader.reload(reloadPolicy);
- else
+ if (clientRedirectPolicy == NotClientRedirect) {
+ if (!m_loader.currentItem())
+ return;
+ FrameLoadType loadType = reloadPolicy == NormalReload ?
+ FrameLoadTypeReload : FrameLoadTypeReloadFromOrigin;
+ FrameLoadRequest request = FrameLoader::frameRequestForReload(
+ m_loader.resourceRequestForReload(*this, loadType, KURL(), clientRedirectPolicy),
+ clientRedirectPolicy);
+ m_loader.load(request, loadType);
+ } else {
m_navigationScheduler.scheduleReload();
+ }
}
void LocalFrame::detach()
« no previous file with comments | « no previous file | Source/core/inspector/InspectorResourceContentLoader.cpp » ('j') | Source/core/loader/FrameLoader.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698