| Index: Source/core/loader/FrameLoader.cpp
|
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
|
| index 6defc6d323ee37668106994e4e9c88cd705b6561..bfd000e35ed1c4c84a89a40d4e85481013e895a1 100644
|
| --- a/Source/core/loader/FrameLoader.cpp
|
| +++ b/Source/core/loader/FrameLoader.cpp
|
| @@ -770,10 +770,10 @@ void FrameLoader::reportLocalLoadFailed(LocalFrame* frame, const String& url)
|
| frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url);
|
| }
|
|
|
| -static ResourceRequest requestFromHistoryItem(HistoryItem* item, ResourceRequestCachePolicy cachePolicy)
|
| +static ResourceRequest requestFromHistoryItem(HistoryItem* item, ResourceRequestCachePolicy cachePolicy, Frame* frame)
|
| {
|
| RefPtr<FormData> formData = item->formData();
|
| - ResourceRequest request(item->url(), item->referrer());
|
| + ResourceRequest request = ResourceRequest(item->url(), frame->isMainFrame(), item->referrer());
|
| request.setCachePolicy(cachePolicy);
|
| if (formData) {
|
| request.setHTTPMethod("POST");
|
| @@ -791,7 +791,7 @@ void FrameLoader::reload(ReloadPolicy reloadPolicy, const KURL& overrideURL, con
|
| return;
|
|
|
| ResourceRequestCachePolicy cachePolicy = reloadPolicy == EndToEndReload ? ReloadBypassingCache : ReloadIgnoringCacheData;
|
| - ResourceRequest request = requestFromHistoryItem(m_currentItem.get(), cachePolicy);
|
| + ResourceRequest request = requestFromHistoryItem(m_currentItem.get(), cachePolicy, m_frame);
|
| if (!overrideURL.isEmpty()) {
|
| request.setURL(overrideURL);
|
| request.clearHTTPReferrer();
|
| @@ -1438,7 +1438,8 @@ void FrameLoader::loadHistoryItem(HistoryItem* item, HistoryLoadType historyLoad
|
| restoreScrollPositionAndViewState();
|
| return;
|
| }
|
| - loadWithNavigationAction(NavigationAction(requestFromHistoryItem(item, cachePolicy), FrameLoadTypeBackForward), FrameLoadTypeBackForward, nullptr, SubstituteData(), CheckContentSecurityPolicy);
|
| + loadWithNavigationAction(NavigationAction(requestFromHistoryItem(item, cachePolicy, m_frame),
|
| + FrameLoadTypeBackForward), FrameLoadTypeBackForward, nullptr, SubstituteData(), CheckContentSecurityPolicy);
|
| }
|
|
|
| void FrameLoader::dispatchDocumentElementAvailable()
|
|
|