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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 339593005: Set the target type when creating the request for main resource (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 6 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/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 783f7c6b2130e229396c2bb248d8e218fdf1ecc8..e0b1fad0c36c0b89f4624743566c70cac52d8cb1 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -770,10 +770,11 @@ 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::createMainResourceRequest(
+ item->url(), frame->isMainFrame(), item->referrer());
request.setCachePolicy(cachePolicy);
if (formData) {
request.setHTTPMethod("POST");
@@ -791,7 +792,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 +1439,7 @@ void FrameLoader::loadHistoryItem(HistoryItem* item, HistoryLoadType historyLoad
restoreScrollPositionAndViewState();
return;
}
- loadWithNavigationAction(NavigationAction(requestFromHistoryItem(item, cachePolicy), FrameLoadTypeBackForward), FrameLoadTypeBackForward, nullptr, SubstituteData());
+ loadWithNavigationAction(NavigationAction(requestFromHistoryItem(item, cachePolicy, m_frame), FrameLoadTypeBackForward), FrameLoadTypeBackForward, nullptr, SubstituteData());
}
void FrameLoader::dispatchDocumentElementAvailable()

Powered by Google App Engine
This is Rietveld 408576698