Chromium Code Reviews| Index: Source/core/loader/FrameLoader.cpp |
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp |
| index c973368e0dddfd1e43d707f42fc200e97b2b2c9f..9940c33416300bba1848afc2e4a8a3a1af43f018 100644 |
| --- a/Source/core/loader/FrameLoader.cpp |
| +++ b/Source/core/loader/FrameLoader.cpp |
| @@ -817,7 +817,7 @@ ResourceRequest FrameLoader::requestFromHistoryItem(HistoryItem* item, ResourceR |
| return request; |
| } |
| -void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, const AtomicString& overrideEncoding) |
| +void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, const AtomicString& overrideEncoding, ClientRedirectPolicy clientRedirectPolicy) |
| { |
| if (!m_currentItem) |
| return; |
| @@ -826,13 +826,16 @@ void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, con |
| ResourceRequest request = requestFromHistoryItem(m_currentItem.get(), cachePolicy); |
| request.setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTypeTopLevel : WebURLRequest::FrameTypeNested); |
| request.setRequestContext(WebURLRequest::RequestContextInternal); |
| + |
| + if (clientRedirectPolicy == ClientRedirect) |
|
Nate Chapin
2014/07/28 20:05:04
This effectively makes the policy: Use m_currenIte
abarth-chromium
2014/07/29 16:58:40
Sure
|
| + request.setHTTPReferrer(Referrer(m_frame->document()->outgoingReferrer(), m_frame->document()->referrerPolicy())); |
| if (!overrideURL.isEmpty()) { |
| request.setURL(overrideURL); |
| request.clearHTTPReferrer(); |
| } |
| FrameLoadType type = reloadPolicy == EndToEndReload ? FrameLoadTypeReloadFromOrigin : FrameLoadTypeReload; |
| - loadWithNavigationAction(NavigationAction(request, type), type, nullptr, SubstituteData(), CheckContentSecurityPolicy, NotClientRedirect, overrideEncoding); |
| + loadWithNavigationAction(NavigationAction(request, type), type, nullptr, SubstituteData(), CheckContentSecurityPolicy, clientRedirectPolicy, overrideEncoding); |
| } |
| void FrameLoader::stopAllLoaders() |