[webkit-changes] [207404] trunk/Source/WebKit2

Mon, 17 Oct 2016 03:44:55 -0700

Title: [207404] trunk/Source/WebKit2
Revision
207404
Author
carlo...@webkit.org
Date
2016-10-17 03:45:15 -0700 (Mon, 17 Oct 2016)

Log Message

[GTK] Switch to use API::DownloadClient instead of the C API client
https://bugs.webkit.org/show_bug.cgi?id=163537

Reviewed by Michael Catanzaro.

The code is simpler and we avoid all the toImpl/toAPI.

* UIProcess/API/gtk/WebKitDownloadClient.cpp:
(attachDownloadClientToContext):
(didStart):
(didReceiveResponse):
(didReceiveData):
(decideDestinationWithSuggestedFilename):
(didCreateDestination):
(didFail):
(didCancel):
(didFinish):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (207403 => 207404)


--- trunk/Source/WebKit2/ChangeLog	2016-10-17 09:06:17 UTC (rev 207403)
+++ trunk/Source/WebKit2/ChangeLog	2016-10-17 10:45:15 UTC (rev 207404)
@@ -1,3 +1,23 @@
+2016-10-17  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Switch to use API::DownloadClient instead of the C API client
+        https://bugs.webkit.org/show_bug.cgi?id=163537
+
+        Reviewed by Michael Catanzaro.
+
+        The code is simpler and we avoid all the toImpl/toAPI.
+
+        * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+        (attachDownloadClientToContext):
+        (didStart):
+        (didReceiveResponse):
+        (didReceiveData):
+        (decideDestinationWithSuggestedFilename):
+        (didCreateDestination):
+        (didFail):
+        (didCancel):
+        (didFinish):
+
 2016-10-17  Manuel Rego Casasnovas  <r...@igalia.com>
 
         [css-grid] Disable CSS Grid Layout runtime flag by default

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (207403 => 207404)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp	2016-10-17 09:06:17 UTC (rev 207403)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp	2016-10-17 10:45:15 UTC (rev 207404)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitDownloadClient.h"
 
-#include "APIURLResponse.h"
+#include "APIDownloadClient.h"
 #include "WebKitDownloadPrivate.h"
 #include "WebKitURIResponsePrivate.h"
 #include "WebKitWebContextPrivate.h"
@@ -32,85 +32,78 @@
 using namespace WebCore;
 using namespace WebKit;
 
-static void didStart(WKContextRef, WKDownloadRef wkDownload, const void* clientInfo)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    webkitWebContextDownloadStarted(WEBKIT_WEB_CONTEXT(clientInfo), download.get());
-}
+class DownloadClient final : public API::DownloadClient {
+public:
+    explicit DownloadClient(WebKitWebContext* webContext)
+        : m_webContext(webContext)
+    {
+    }
 
-static void didReceiveResponse(WKContextRef, WKDownloadRef wkDownload, WKURLResponseRef wkResponse, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    if (webkitDownloadIsCancelled(download.get()))
-        return;
+private:
+    void didStart(WebProcessPool*, DownloadProxy* downloadProxy) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        webkitWebContextDownloadStarted(m_webContext, download.get());
+    }
 
-    GRefPtr<WebKitURIResponse> response = adoptGRef(webkitURIResponseCreateForResourceResponse(toImpl(wkResponse)->resourceResponse()));
-    webkitDownloadSetResponse(download.get(), response.get());
-}
+    void didReceiveResponse(WebProcessPool*, DownloadProxy* downloadProxy, const ResourceResponse& resourceResponse) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        if (webkitDownloadIsCancelled(download.get()))
+            return;
 
-static void didReceiveData(WKContextRef, WKDownloadRef wkDownload, uint64_t length, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    webkitDownloadNotifyProgress(download.get(), length);
-}
+        GRefPtr<WebKitURIResponse> response = adoptGRef(webkitURIResponseCreateForResourceResponse(resourceResponse));
+        webkitDownloadSetResponse(download.get(), response.get());
+    }
 
-static WKStringRef decideDestinationWithSuggestedFilename(WKContextRef, WKDownloadRef wkDownload, WKStringRef filename, bool* allowOverwrite, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    CString destinationURI = webkitDownloadDecideDestinationWithSuggestedFilename(download.get(), toImpl(filename)->string().utf8(), *allowOverwrite);
-    return WKStringCreateWithUTF8CString(destinationURI.data());
-}
+    void didReceiveData(WebProcessPool*, DownloadProxy* downloadProxy, uint64_t length) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        webkitDownloadNotifyProgress(download.get(), length);
+    }
 
-static void didCreateDestination(WKContextRef, WKDownloadRef wkDownload, WKStringRef path, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    webkitDownloadDestinationCreated(download.get(), toImpl(path)->string().utf8());
-}
+    String decideDestinationWithSuggestedFilename(WebProcessPool*, DownloadProxy* downloadProxy, const String& filename, bool& allowOverwrite) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        return String::fromUTF8(webkitDownloadDecideDestinationWithSuggestedFilename(download.get(), filename.utf8(), allowOverwrite));
+    }
 
-static void didFail(WKContextRef, WKDownloadRef wkDownload, WKErrorRef error, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    if (webkitDownloadIsCancelled(download.get())) {
-        // Cancellation takes precedence over other errors.
+    void didCreateDestination(WebProcessPool*, DownloadProxy* downloadProxy, const String& path) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        webkitDownloadDestinationCreated(download.get(), path.utf8());
+    }
+
+    void didFail(WebProcessPool*, DownloadProxy* downloadProxy, const ResourceError& error) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        if (webkitDownloadIsCancelled(download.get())) {
+            // Cancellation takes precedence over other errors.
+            webkitDownloadCancelled(download.get());
+        } else
+            webkitDownloadFailed(download.get(), error);
+        webkitWebContextRemoveDownload(downloadProxy);
+    }
+
+    void didCancel(WebProcessPool*, DownloadProxy* downloadProxy) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
         webkitDownloadCancelled(download.get());
-    } else
-        webkitDownloadFailed(download.get(), toImpl(error)->platformError());
-    webkitWebContextRemoveDownload(toImpl(wkDownload));
-}
+        webkitWebContextRemoveDownload(downloadProxy);
+    }
 
-static void didCancel(WKContextRef, WKDownloadRef wkDownload, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    webkitDownloadCancelled(download.get());
-    webkitWebContextRemoveDownload(toImpl(wkDownload));
-}
+    void didFinish(WebProcessPool*, DownloadProxy* downloadProxy) override
+    {
+        GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(downloadProxy);
+        webkitDownloadFinished(download.get());
+        webkitWebContextRemoveDownload(downloadProxy);
+    }
 
-static void didFinish(WKContextRef, WKDownloadRef wkDownload, const void* /* clientInfo */)
-{
-    GRefPtr<WebKitDownload> download = webkitWebContextGetOrCreateDownload(toImpl(wkDownload));
-    webkitDownloadFinished(download.get());
-    webkitWebContextRemoveDownload(toImpl(wkDownload));
-}
+    WebKitWebContext* m_webContext;
+};
 
 void attachDownloadClientToContext(WebKitWebContext* webContext)
 {
-    WKContextDownloadClientV0 wkDownloadClient = {
-        {
-            0, // version
-            webContext, // ClientInfo
-        },
-        didStart,
-        0, // didReceiveAuthenticationChallenge
-        didReceiveResponse,
-        didReceiveData,
-        0, // shouldDecodeSourceDataOfMIMEType
-        decideDestinationWithSuggestedFilename,
-        didCreateDestination,
-        didFinish,
-        didFail,
-        didCancel,
-        0, // processDidCrash
-    };
-    WKContextSetDownloadClient(toAPI(webkitWebContextGetProcessPool(webContext)), &wkDownloadClient.base);
+    auto* processPool = webkitWebContextGetProcessPool(webContext);
+    processPool->setDownloadClient(std::make_unique<DownloadClient>(webContext));
 }
-

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to