Changeset 43319 in webkit

Timestamp:

May 6, 2009 12:38:53 PM (15 years ago)

Author:

kov@webkit.org

Message:

2009-05-06 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=24786
WebKitDownload sometimes suggests peculiar filenames

When a download is requested by an ongoing request, use the already
provided response to set the suggested filename for the WebKitDownload
object, if available.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::download):
• webkit/webkitdownload.cpp: (_WebKitDownloadPrivate::webkit_download_set_property): (_WebKitDownloadPrivate::webkit_download_get_suggested_filename): (_WebKitDownloadPrivate::webkit_download_set_suggested_filename):
• webkit/webkitprivate.h:
• webkit/webkitwebview.cpp:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)
• webkit/webkitdownload.cpp (modified) (2 diffs)
• webkit/webkitprivate.h (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-05-06  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24786
+        WebKitDownload sometimes suggests peculiar filenames
+
+        When a download is requested by an ongoing request, use the already
+        provided response to set the suggested filename for the WebKitDownload
+        object, if available.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::download):
+        * webkit/webkitdownload.cpp:
+        (_WebKitDownloadPrivate::webkit_download_set_property):
+        (_WebKitDownloadPrivate::webkit_download_get_suggested_filename):
+        (_WebKitDownloadPrivate::webkit_download_set_suggested_filename):
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebview.cpp:
+
 2009-05-06  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -910 +910 @@
 }
 
-void FrameLoaderClient::download(ResourceHandle* handle, const ResourceRequest& request, const ResourceRequest&, const ResourceResponse&)
+void FrameLoaderClient::download(ResourceHandle* handle, const ResourceRequest& request, const ResourceRequest&, const ResourceResponse& response)
 {
     // FIXME: We could reuse the same handle here, but when I tried
@@ -916 +916 @@
     // simplified this case for now.
     handle->cancel();
-    startDownload(request);
+
+    WebKitNetworkRequest* networkRequest = webkit_network_request_new(request.url().string().utf8().data());
+    WebKitWebView* view = getViewFromFrame(m_frame);
+
+    webkit_web_view_request_download(view, networkRequest, response);
+    g_object_unref(networkRequest);
 }
 

trunk/WebKit/gtk/webkit/webkitdownload.cpp

@@ -185 +185 @@
     WebKitDownload* download = WEBKIT_DOWNLOAD(object);
     WebKitDownloadPrivate* priv = download->priv;
-    KURL url;
 
     switch(prop_id) {
     case PROP_NETWORK_REQUEST:
         priv->networkRequest = WEBKIT_NETWORK_REQUEST(g_value_dup_object(value));
-        // This is safe as network-request is a construct only property and
-        // suggestedFilename is initially null.
-        url = KURL(KURL(), webkit_network_request_get_uri(priv->networkRequest));
-        url.setQuery(String());
-        url.removeRef();
-        priv->suggestedFilename = g_strdup(decodeURLEscapeSequences(url.lastPathComponent()).utf8().data());
         break;
     case PROP_DESTINATION_URI:
@@ -533 +526 @@
 
     WebKitDownloadPrivate* priv = download->priv;
+    if (priv->suggestedFilename)
+        return priv->suggestedFilename;
+
+    KURL url = KURL(KURL(), webkit_network_request_get_uri(priv->networkRequest));
+    url.setQuery(String());
+    url.removeRef();
+    priv->suggestedFilename = g_strdup(decodeURLEscapeSequences(url.lastPathComponent()).utf8().data());
     return priv->suggestedFilename;
 }
+
+// for internal use only
+void webkit_download_set_suggested_filename(WebKitDownload* download, const gchar* suggestedFilename)
+{
+    WebKitDownloadPrivate* priv = download->priv;
+    g_free(priv->suggestedFilename);
+    priv->suggestedFilename = g_strdup(suggestedFilename);
+}
+
 
 /**

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -169 +169 @@
 
     void
-    webkit_web_view_request_download(WebKitWebView* web_view, WebKitNetworkRequest* request);
+    webkit_web_view_request_download(WebKitWebView* web_view, WebKitNetworkRequest* request, const WebCore::ResourceResponse& response = WebCore::ResourceResponse());
+
+    void
+    webkit_download_set_suggested_filename(WebKitDownload* download, const gchar* suggestedFilename);
 
     WebKitWebPolicyDecision*

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -2144 +2144 @@
 }
 
-void webkit_web_view_request_download(WebKitWebView* webView, WebKitNetworkRequest* request)
+void webkit_web_view_request_download(WebKitWebView* webView, WebKitNetworkRequest* request, const ResourceResponse& response)
 {
     g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
 
     WebKitDownload* download = webkit_download_new(request);
+
+    if (!response.isNull() && !response.suggestedFilename().isEmpty())
+        webkit_download_set_suggested_filename(download, response.suggestedFilename().utf8().data());
 
     gboolean handled;