Changeset 223798 in webkit

Timestamp:

Oct 20, 2017 4:12:10 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Fix download tests on El Capitan after r223730
​https://bugs.webkit.org/show_bug.cgi?id=178547

• UIProcess/Downloads/DownloadProxy.cpp:

(WebKit::DownloadProxy::decideDestinationWithSuggestedFilename):
Revert to original behavior. This uses suggestedFilename, which may have come from places like
the download attribute, instead of always using the filename from CFNetwork.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Downloads/DownloadProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-20  Alex Christensen  <achristensen@webkit.org>
+
+        Fix download tests on El Capitan after r223730
+        https://bugs.webkit.org/show_bug.cgi?id=178547
+
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        (WebKit::DownloadProxy::decideDestinationWithSuggestedFilename):
+        Revert to original behavior.  This uses suggestedFilename, which may have come from places like
+        the download attribute, instead of always using the filename from CFNetwork.
+
 2017-10-20  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp

@@ -206 +206 @@
 
     String suggestedFilename = MIMETypeRegistry::appendFileExtensionIfNecessary(m_suggestedFilename.isEmpty() ? filename : m_suggestedFilename, mimeType);
-    m_processPool->downloadClient().decideDestinationWithSuggestedFilename(*m_processPool, *this, filename, [reply = WTFMove(reply)] (AllowOverwrite allowOverwrite, String destination) {
+    m_processPool->downloadClient().decideDestinationWithSuggestedFilename(*m_processPool, *this, suggestedFilename, [reply = WTFMove(reply)] (AllowOverwrite allowOverwrite, String destination) {
         SandboxExtension::Handle sandboxExtensionHandle;
         if (!destination.isNull())