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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2167623002: Reload: propagate FrameLoadType to child frames Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add some comments Created 4 years, 5 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: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 8c9fb0d931e68880b7fbc57cad647ae04aa4d157..43710b2cfee48cd51f379efa526ef8d25e7daad7 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -356,8 +356,7 @@ void LocalFrame::navigate(const FrameLoadRequest& request)
void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedirectPolicy)
{
- ASSERT(loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadBypassingCache);
- ASSERT(clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect || loadType == FrameLoadTypeReload);
+ DCHECK(isReloadLoadType(loadType));
if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) {
if (!m_loader.currentItem())
return;
@@ -366,6 +365,7 @@ void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedir
request.setClientRedirect(clientRedirectPolicy);
m_loader.load(request, loadType);
} else {
+ DCHECK(loadType == FrameLoadTypeReload);
m_navigationScheduler->scheduleReload();
}
}

Powered by Google App Engine
This is Rietveld 408576698