Changeset 51825 in webkit

Timestamp:

Dec 7, 2009 6:44:05 PM (14 years ago)

Author:

kov@webkit.org

Message:

WebCore

Reviewed by Xan Lopez.

[GTK] Doesn't respect Content-Disposition for downloads, and provides no way for apps to do that
​https://bugs.webkit.org/show_bug.cgi?id=32247

Allow creating a ResourceResponse from a SoupMessage.

Covered by API test.

• platform/network/soup/ResourceResponse.h: (WebCore::ResourceResponse::ResourceResponse):
• platform/network/soup/ResourceResponseSoup.cpp: (WebCore::ResourceResponse::updateFromSoupMessage):

WebKit/gtk

Reviewed by Xan Lopez.

[GTK] Doesn't respect Content-Disposition for downloads, and provides no way for apps to do that
​https://bugs.webkit.org/show_bug.cgi?id=32247

Provide a way for applications to respect Content-Disposition, by
fetching the WebKitNetworkResponse from the frame during
mime-type-policy-decision-requested.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::dispatchDecidePolicyForMIMEType): Download content when Content-Disposition is attachment.
• tests/testmimehandling.c: (server_callback): (mime_type_policy_decision_requested_cb):
• tests/testwebframe.c: (test_webkit_web_frame_response): (main):
• webkit/webkitprivate.cpp: (WebKit::core):
• webkit/webkitwebframe.cpp: (webkit_web_frame_get_network_response):
• webkit/webkitwebframe.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/soup/ResourceResponse.h (modified) (1 diff)
• WebCore/platform/network/soup/ResourceResponseSoup.cpp (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/tests/testmimehandling.c (modified) (2 diffs)
• WebKit/gtk/tests/testwebframe.c (modified) (2 diffs)
• WebKit/gtk/webkit/webkitprivate.cpp (modified) (2 diffs)
• WebKit/gtk/webkit/webkitwebframe.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebframe.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Doesn't respect Content-Disposition for downloads, and provides no way for apps to do that
+        https://bugs.webkit.org/show_bug.cgi?id=32247
+
+        Allow creating a ResourceResponse from a SoupMessage.
+
+        Covered by API test.
+
+        * platform/network/soup/ResourceResponse.h:
+        (WebCore::ResourceResponse::ResourceResponse):
+        * platform/network/soup/ResourceResponseSoup.cpp:
+        (WebCore::ResourceResponse::updateFromSoupMessage):
+
 2009-12-07  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/platform/network/soup/ResourceResponse.h

@@ -45 +45 @@
     }
 
+    ResourceResponse(SoupMessage* soupMessage)
+        : ResourceResponseBase()
+    {
+        updateFromSoupMessage(soupMessage);
+    }
+
     SoupMessage* toSoupMessage() const;
+    void updateFromSoupMessage(SoupMessage* soupMessage);
 
 private:

trunk/WebCore/platform/network/soup/ResourceResponseSoup.cpp

@@ -23 +23 @@
 
 #include "CString.h"
+#include "GOwnPtr.h"
 #include "PlatformString.h"
 
@@ -50 +51 @@
 }
 
+void ResourceResponse::updateFromSoupMessage(SoupMessage* soupMessage)
+{
+    SoupURI* soupURI = soup_message_get_uri(soupMessage);
+    GOwnPtr<gchar> uri(soup_uri_to_string(soupURI, FALSE));
+    m_url = KURL(KURL(), String::fromUTF8(uri.get()));
+
+    m_httpStatusCode = soupMessage->status_code;
+
+    SoupMessageHeadersIter headersIter;
+    const char* headerName;
+    const char* headerValue;
+
+    soup_message_headers_iter_init(&headersIter, soupMessage->response_headers);
+    while (soup_message_headers_iter_next(&headersIter, &headerName, &headerValue))
+        m_httpHeaderFields.set(String::fromUTF8(headerName), String::fromUTF8(headerValue));
 }
+
+}

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-12-07  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Doesn't respect Content-Disposition for downloads, and provides no way for apps to do that
+        https://bugs.webkit.org/show_bug.cgi?id=32247
+
+        Provide a way for applications to respect Content-Disposition, by
+        fetching the WebKitNetworkResponse from the frame during
+        mime-type-policy-decision-requested.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForMIMEType): Download
+        content when Content-Disposition is attachment.
+        * tests/testmimehandling.c:
+        (server_callback):
+        (mime_type_policy_decision_requested_cb):
+        * tests/testwebframe.c:
+        (test_webkit_web_frame_response):
+        (main):
+        * webkit/webkitprivate.cpp:
+        (WebKit::core):
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_get_network_response):
+        * webkit/webkitwebframe.h:
+
 2009-12-07  Gyuyoung Kim  <gyuyoung@gmail.com>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -306 +306 @@
         return;
 
+    GOwnPtr<WebKitNetworkResponse> networkResponse(webkit_web_frame_get_network_response(m_frame));
+    if (networkResponse) {
+        ResourceResponse response = core(networkResponse.get());
+        if (response.isAttachment()) {
+            webkit_web_policy_decision_download(policyDecision);
+            return;
+        }
+    }
+
     if (canShowMIMEType(mimeType))
-        webkit_web_policy_decision_use (policyDecision);
+        webkit_web_policy_decision_use(policyDecision);
     else
-        webkit_web_policy_decision_ignore (policyDecision);
+        webkit_web_policy_decision_ignore(policyDecision);
 }
 

trunk/WebKit/gtk/tests/testmimehandling.c

@@ -68 +68 @@
         GError* error = NULL;
 
+        soup_message_headers_append(msg->response_headers, "Content-Disposition", "attachment; filename=test.txt");
+
         g_file_get_contents("test.txt", &contents, &length, &error);
         g_assert(!error);
@@ -105 +107 @@
         g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
     } else if (g_str_equal(type, "text")) {
+        WebKitNetworkResponse* response = webkit_web_frame_get_network_response(frame);
+        SoupMessage* message = webkit_network_response_get_message(response);
+        char* disposition;
+
+        g_assert(message);
+        soup_message_headers_get_content_disposition(message->response_headers,
+                                                     &disposition, NULL);
+        g_object_unref(response);
+
+        g_assert_cmpstr(disposition, ==, "attachment");
+        g_free(disposition);
+
         g_assert_cmpstr(mime_type, ==, "text/plain");
         g_assert(webkit_web_view_can_show_mime_type(view, mime_type));

trunk/WebKit/gtk/tests/testwebframe.c

@@ -156 +156 @@
 }
 
+static void test_webkit_web_frame_response()
+{
+    WebKitWebFrame* frame = g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL);
+    WebKitNetworkResponse* response = webkit_web_frame_get_network_response(frame);
+    g_assert(!response);
+    g_object_unref(frame);
+}
+
 int main(int argc, char** argv)
 {
@@ -165 +173 @@
     g_test_add_func("/webkit/webframe/lifetime", test_webkit_web_frame_lifetime);
     g_test_add_func("/webkit/webview/printing", test_webkit_web_frame_printing);
+    g_test_add_func("/webkit/webview/response", test_webkit_web_frame_response);
     return g_test_run ();
 }

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -38 +38 @@
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
+#include "ResourceResponse.h"
 #include <runtime/InitializeThreading.h>
 #include "SecurityOrigin.h"
+#include "webkitnetworkresponse.h"
 
 #if ENABLE(DATABASE)
@@ -111 +113 @@
     KURL url = KURL(KURL(), String::fromUTF8(webkit_network_request_get_uri(request)));
     return ResourceRequest(url);
+}
+
+WebCore::ResourceResponse core(WebKitNetworkResponse* response)
+{
+    SoupMessage* soupMessage = webkit_network_response_get_message(response);
+    if (soupMessage)
+        return ResourceResponse(soupMessage);
+
+    return ResourceResponse();
 }
 

trunk/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -1142 +1142 @@
     view->layout();
 }
+
+/**
+ * webkit_web_frame_get_network_response:
+ * @frame: a #WebKitWebFrame
+ *
+ * Returns a #WebKitNetworkResponse object representing the response
+ * that was given to the request for the given frame, or NULL if the
+ * frame was not created by a load. You must unref the object when you
+ * are done with it.
+ *
+ * Return value: a #WebKitNetworkResponse object
+ *
+ * Since: 1.1.18
+ */
+WebKitNetworkResponse* webkit_web_frame_get_network_response(WebKitWebFrame* frame)
+{
+    Frame* coreFrame = core(frame);
+    if (!coreFrame)
+        return NULL;
+
+    WebCore::DocumentLoader* loader = coreFrame->loader()->activeDocumentLoader();
+    if (!loader)
+        return NULL;
+
+    return webkit_network_response_new_with_core_response(loader->response());
+}

trunk/WebKit/gtk/webkit/webkitwebframe.h

@@ -173 +173 @@
 webkit_web_frame_get_security_origin         (WebKitWebFrame       *frame);
 
+WEBKIT_API WebKitNetworkResponse*
+webkit_web_frame_get_network_response        (WebKitWebFrame       *frame);
+
 G_END_DECLS