@@ -1418,7 +1418,7 @@ void FrameLoader::loadURL(FrameLoadRequest&& frameLoadRequest, const String& ref
1418
1418
if (isSystemPreview)
1419
1419
request.setSystemPreviewInfo (frameLoadRequest.systemPreviewInfo ());
1420
1420
#endif
1421
- loadWithNavigationAction (request, WTFMove (action), newLoadType, WTFMove (formState), allowNavigationToInvalidURL, frameLoadRequest. downloadAttribute (), [this , isRedirect, sameURL, newLoadType, protectedFrame = makeRef (m_frame), completionHandler = completionHandlerCaller.release ()] () mutable {
1421
+ loadWithNavigationAction (request, WTFMove (action), newLoadType, WTFMove (formState), allowNavigationToInvalidURL, [this , isRedirect, sameURL, newLoadType, protectedFrame = makeRef (m_frame), completionHandler = completionHandlerCaller.release ()] () mutable {
1422
1422
if (isRedirect) {
1423
1423
m_quickRedirectComing = false ;
1424
1424
if (m_provisionalDocumentLoader)
@@ -1495,12 +1495,11 @@ void FrameLoader::load(FrameLoadRequest&& request)
1495
1495
load (loader.get ());
1496
1496
}
1497
1497
1498
- void FrameLoader::loadWithNavigationAction (const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr<FormState>&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, const String& downloadAttribute, CompletionHandler<void ()>&& completionHandler)
1498
+ void FrameLoader::loadWithNavigationAction (const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr<FormState>&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, CompletionHandler<void ()>&& completionHandler)
1499
1499
{
1500
1500
FRAMELOADER_RELEASE_LOG_IF_ALLOWED (ResourceLoading, " loadWithNavigationAction: frame load started" );
1501
1501
1502
1502
Ref<DocumentLoader> loader = m_client->createDocumentLoader (request, defaultSubstituteDataForURL (request.url ()));
1503
- loader->setDownloadAttribute (downloadAttribute);
1504
1503
applyShouldOpenExternalURLsPolicyToNewDocumentLoader (m_frame, loader, action.initiatedByMainFrame (), action.shouldOpenExternalURLsPolicy ());
1505
1504
1506
1505
if (action.lockHistory () == LockHistory::Yes && m_documentLoader)
@@ -3012,13 +3011,13 @@ void FrameLoader::loadPostRequest(FrameLoadRequest&& request, const String& refe
3012
3011
if (Document* document = m_frame.document ())
3013
3012
document->contentSecurityPolicy ()->upgradeInsecureRequestIfNeeded (workingResourceRequest, ContentSecurityPolicy::InsecureRequestType::Load);
3014
3013
3015
- NavigationAction action { request.requester (), workingResourceRequest, request.initiatedByMainFrame (), loadType, true , event, request.shouldOpenExternalURLsPolicy (), request. downloadAttribute () };
3014
+ NavigationAction action { request.requester (), workingResourceRequest, request.initiatedByMainFrame (), loadType, true , event, request.shouldOpenExternalURLsPolicy (), { } };
3016
3015
action.setLockHistory (lockHistory);
3017
3016
3018
3017
if (!frameName.isEmpty ()) {
3019
3018
// The search for a target frame is done earlier in the case of form submission.
3020
3019
if (auto * targetFrame = formState ? nullptr : findFrameForNavigation (frameName)) {
3021
- targetFrame->loader ().loadWithNavigationAction (workingResourceRequest, WTFMove (action), loadType, WTFMove (formState), allowNavigationToInvalidURL, { }, WTFMove (completionHandler));
3020
+ targetFrame->loader ().loadWithNavigationAction (workingResourceRequest, WTFMove (action), loadType, WTFMove (formState), allowNavigationToInvalidURL, WTFMove (completionHandler));
3022
3021
return ;
3023
3022
}
3024
3023
@@ -3031,7 +3030,7 @@ void FrameLoader::loadPostRequest(FrameLoadRequest&& request, const String& refe
3031
3030
3032
3031
// must grab this now, since this load may stop the previous load and clear this flag
3033
3032
bool isRedirect = m_quickRedirectComing;
3034
- loadWithNavigationAction (workingResourceRequest, WTFMove (action), loadType, WTFMove (formState), allowNavigationToInvalidURL, { }, [this , isRedirect, protectedFrame = makeRef (m_frame), completionHandler = WTFMove (completionHandler)] () mutable {
3033
+ loadWithNavigationAction (workingResourceRequest, WTFMove (action), loadType, WTFMove (formState), allowNavigationToInvalidURL, [this , isRedirect, protectedFrame = makeRef (m_frame), completionHandler = WTFMove (completionHandler)] () mutable {
3035
3034
if (isRedirect) {
3036
3035
m_quickRedirectComing = false ;
3037
3036
if (m_provisionalDocumentLoader)
0 commit comments