[webkit-changes] [260843] trunk/Source/WebCore

Tue, 28 Apr 2020 13:42:24 -0700

Title: [260843] trunk/Source/WebCore
Revision
260843
Author
[email protected]
Date
2020-04-28 13:41:35 -0700 (Tue, 28 Apr 2020)

Log Message

Remove downloadAttribute from DocumentLoader
https://bugs.webkit.org/show_bug.cgi?id=210493

Patch by Rob Buis <[email protected]> on 2020-04-28
Reviewed by Darin Adler.

Remove downloadAttribute from DocumentLoader since this
can be obtained from the NavigationAction.

* loader/DocumentLoader.h:
(WebCore::DocumentLoader::downloadAttribute const):
(WebCore::DocumentLoader::setDownloadAttribute): Deleted.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadURL):
(WebCore::FrameLoader::loadWithNavigationAction):
(WebCore::FrameLoader::loadPostRequest):
* loader/FrameLoader.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (260842 => 260843)


--- trunk/Source/WebCore/ChangeLog	2020-04-28 19:53:42 UTC (rev 260842)
+++ trunk/Source/WebCore/ChangeLog	2020-04-28 20:41:35 UTC (rev 260843)
@@ -1,3 +1,22 @@
+2020-04-28  Rob Buis  <[email protected]>
+
+        Remove downloadAttribute from DocumentLoader
+        https://bugs.webkit.org/show_bug.cgi?id=210493
+
+        Reviewed by Darin Adler.
+
+        Remove downloadAttribute from DocumentLoader since this
+        can be obtained from the NavigationAction.
+
+        * loader/DocumentLoader.h:
+        (WebCore::DocumentLoader::downloadAttribute const):
+        (WebCore::DocumentLoader::setDownloadAttribute): Deleted.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadURL):
+        (WebCore::FrameLoader::loadWithNavigationAction):
+        (WebCore::FrameLoader::loadPostRequest):
+        * loader/FrameLoader.h:
+
 2020-04-28  Jack Lee  <[email protected]>
 
         Nullptr crash in EditCommand::EditCommand via CompositeEditCommand::removeNode

Modified: trunk/Source/WebCore/loader/DocumentLoader.h (260842 => 260843)


--- trunk/Source/WebCore/loader/DocumentLoader.h	2020-04-28 19:53:42 UTC (rev 260842)
+++ trunk/Source/WebCore/loader/DocumentLoader.h	2020-04-28 20:41:35 UTC (rev 260843)
@@ -397,8 +397,7 @@
     void setAllowsDataURLsForMainFrame(bool allowsDataURLsForMainFrame) { m_allowsDataURLsForMainFrame = allowsDataURLsForMainFrame; }
     bool allowsDataURLsForMainFrame() const { return m_allowsDataURLsForMainFrame; }
 
-    void setDownloadAttribute(const String& attribute) { m_downloadAttribute = attribute; }
-    const String& downloadAttribute() const { return m_downloadAttribute; }
+    const AtomString& downloadAttribute() const { return m_triggeringAction.downloadAttribute(); }
 
     WEBCORE_EXPORT void applyPoliciesToSettings();
 
@@ -645,7 +644,6 @@
 
     bool m_allowsWebArchiveForMainFrame { false };
     bool m_allowsDataURLsForMainFrame { false };
-    String m_downloadAttribute;
 };
 
 inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest& request)

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (260842 => 260843)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2020-04-28 19:53:42 UTC (rev 260842)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2020-04-28 20:41:35 UTC (rev 260843)
@@ -1418,7 +1418,7 @@
     if (isSystemPreview)
         request.setSystemPreviewInfo(frameLoadRequest.systemPreviewInfo());
 #endif
-    loadWithNavigationAction(request, WTFMove(action), newLoadType, WTFMove(formState), allowNavigationToInvalidURL, frameLoadRequest.downloadAttribute(), [this, isRedirect, sameURL, newLoadType, protectedFrame = makeRef(m_frame), completionHandler = completionHandlerCaller.release()] () mutable {
+    loadWithNavigationAction(request, WTFMove(action), newLoadType, WTFMove(formState), allowNavigationToInvalidURL, [this, isRedirect, sameURL, newLoadType, protectedFrame = makeRef(m_frame), completionHandler = completionHandlerCaller.release()] () mutable {
         if (isRedirect) {
             m_quickRedirectComing = false;
             if (m_provisionalDocumentLoader)
@@ -1495,12 +1495,11 @@
     load(loader.get());
 }
 
-void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr<FormState>&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, const String& downloadAttribute, CompletionHandler<void()>&& completionHandler)
+void FrameLoader::loadWithNavigationAction(const ResourceRequest& request, NavigationAction&& action, FrameLoadType type, RefPtr<FormState>&& formState, AllowNavigationToInvalidURL allowNavigationToInvalidURL, CompletionHandler<void()>&& completionHandler)
 {
     FRAMELOADER_RELEASE_LOG_IF_ALLOWED(ResourceLoading, "loadWithNavigationAction: frame load started");
 
     Ref<DocumentLoader> loader = m_client->createDocumentLoader(request, defaultSubstituteDataForURL(request.url()));
-    loader->setDownloadAttribute(downloadAttribute);
     applyShouldOpenExternalURLsPolicyToNewDocumentLoader(m_frame, loader, action.initiatedByMainFrame(), action.shouldOpenExternalURLsPolicy());
 
     if (action.lockHistory() == LockHistory::Yes && m_documentLoader)
@@ -3012,13 +3011,13 @@
     if (Document* document = m_frame.document())
         document->contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(workingResourceRequest, ContentSecurityPolicy::InsecureRequestType::Load);
 
-    NavigationAction action { request.requester(), workingResourceRequest, request.initiatedByMainFrame(), loadType, true, event, request.shouldOpenExternalURLsPolicy(), request.downloadAttribute() };
+    NavigationAction action { request.requester(), workingResourceRequest, request.initiatedByMainFrame(), loadType, true, event, request.shouldOpenExternalURLsPolicy(), { } };
     action.setLockHistory(lockHistory);
 
     if (!frameName.isEmpty()) {
         // The search for a target frame is done earlier in the case of form submission.
         if (auto* targetFrame = formState ? nullptr : findFrameForNavigation(frameName)) {
-            targetFrame->loader().loadWithNavigationAction(workingResourceRequest, WTFMove(action), loadType, WTFMove(formState), allowNavigationToInvalidURL, { }, WTFMove(completionHandler));
+            targetFrame->loader().loadWithNavigationAction(workingResourceRequest, WTFMove(action), loadType, WTFMove(formState), allowNavigationToInvalidURL, WTFMove(completionHandler));
             return;
         }
 
@@ -3031,7 +3030,7 @@
 
     // must grab this now, since this load may stop the previous load and clear this flag
     bool isRedirect = m_quickRedirectComing;
-    loadWithNavigationAction(workingResourceRequest, WTFMove(action), loadType, WTFMove(formState), allowNavigationToInvalidURL, { }, [this, isRedirect, protectedFrame = makeRef(m_frame), completionHandler = WTFMove(completionHandler)] () mutable {
+    loadWithNavigationAction(workingResourceRequest, WTFMove(action), loadType, WTFMove(formState), allowNavigationToInvalidURL, [this, isRedirect, protectedFrame = makeRef(m_frame), completionHandler = WTFMove(completionHandler)] () mutable {
         if (isRedirect) {
             m_quickRedirectComing = false;
             if (m_provisionalDocumentLoader)

Modified: trunk/Source/WebCore/loader/FrameLoader.h (260842 => 260843)


--- trunk/Source/WebCore/loader/FrameLoader.h	2020-04-28 19:53:42 UTC (rev 260842)
+++ trunk/Source/WebCore/loader/FrameLoader.h	2020-04-28 20:41:35 UTC (rev 260843)
@@ -388,7 +388,7 @@
     void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, RefPtr<FormState>&&, AllowNavigationToInvalidURL, CompletionHandler<void()>&& = [] { }); // Calls continueLoadAfterNavigationPolicy
     void load(DocumentLoader&); // Calls loadWithDocumentLoader
 
-    void loadWithNavigationAction(const ResourceRequest&, NavigationAction&&, FrameLoadType, RefPtr<FormState>&&, AllowNavigationToInvalidURL, const String& downloadAttribute = { }, CompletionHandler<void()>&& = [] { }); // Calls loadWithDocumentLoader
+    void loadWithNavigationAction(const ResourceRequest&, NavigationAction&&, FrameLoadType, RefPtr<FormState>&&, AllowNavigationToInvalidURL, CompletionHandler<void()>&& = [] { }); // Calls loadWithDocumentLoader
 
     void loadPostRequest(FrameLoadRequest&&, const String& referrer, FrameLoadType, Event*, RefPtr<FormState>&&, CompletionHandler<void()>&&);
     void loadURL(FrameLoadRequest&&, const String& referrer, FrameLoadType, Event*, RefPtr<FormState>&&, Optional<AdClickAttribution>&&, CompletionHandler<void()>&&);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to