Title: [250819] trunk/Source
Revision
250819
Author
carlo...@webkit.org
Date
2019-10-08 02:06:30 -0700 (Tue, 08 Oct 2019)

Log Message

Unreviewed. Remove unused WebKitSoupRequestGeneric after r250597

Source/WebCore:

* platform/Soup.cmake:
* platform/SourcesSoup.txt:
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupRequest const):
* platform/network/soup/WebKitSoupRequestGeneric.cpp: Removed.
* platform/network/soup/WebKitSoupRequestGeneric.h: Removed.
* platform/network/soup/WebKitSoupRequestGenericClient.h: Removed.

Source/WebKit:

* NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h:

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (250818 => 250819)


--- trunk/Source/WebCore/ChangeLog	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/ChangeLog	2019-10-08 09:06:30 UTC (rev 250819)
@@ -1,3 +1,15 @@
+2019-10-08  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Remove unused WebKitSoupRequestGeneric after r250597
+
+        * platform/Soup.cmake:
+        * platform/SourcesSoup.txt:
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateSoupRequest const):
+        * platform/network/soup/WebKitSoupRequestGeneric.cpp: Removed.
+        * platform/network/soup/WebKitSoupRequestGeneric.h: Removed.
+        * platform/network/soup/WebKitSoupRequestGenericClient.h: Removed.
+
 2019-10-08  Antti Koivisto  <an...@apple.com>
 
         [CSS Shadow Parts] Internal shadow pseudo elements should work with ::part

Modified: trunk/Source/WebCore/platform/Soup.cmake (250818 => 250819)


--- trunk/Source/WebCore/platform/Soup.cmake	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/platform/Soup.cmake	2019-10-08 09:06:30 UTC (rev 250819)
@@ -19,8 +19,6 @@
     platform/network/soup/SoupNetworkProxySettings.h
     platform/network/soup/SoupNetworkSession.h
     platform/network/soup/URLSoup.h
-    platform/network/soup/WebKitSoupRequestGeneric.h
-    platform/network/soup/WebKitSoupRequestGenericClient.h
 )
 
 list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES

Modified: trunk/Source/WebCore/platform/SourcesSoup.txt (250818 => 250819)


--- trunk/Source/WebCore/platform/SourcesSoup.txt	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/platform/SourcesSoup.txt	2019-10-08 09:06:30 UTC (rev 250819)
@@ -37,7 +37,6 @@
 platform/network/soup/SoupNetworkSession.cpp
 platform/network/soup/SynchronousLoaderClientSoup.cpp
 platform/network/soup/URLSoup.cpp
-platform/network/soup/WebKitSoupRequestGeneric.cpp
 
 platform/soup/PublicSuffixSoup.cpp
 platform/soup/SharedBufferSoup.cpp

Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (250818 => 250819)


--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp	2019-10-08 09:06:30 UTC (rev 250819)
@@ -29,7 +29,6 @@
 #include "MIMETypeRegistry.h"
 #include "SharedBuffer.h"
 #include "URLSoup.h"
-#include "WebKitSoupRequestGeneric.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
@@ -186,9 +185,6 @@
         *initiatingPageIDPtr = *m_initiatingPageID;
         g_object_set_data_full(G_OBJECT(soupRequest), g_intern_static_string(gSoupRequestInitiatingPageIDKey), initiatingPageIDPtr, fastFree);
     }
-
-    if (WEBKIT_IS_SOUP_REQUEST_GENERIC(soupRequest))
-        webkitSoupRequestGenericSetRequest(WEBKIT_SOUP_REQUEST_GENERIC(soupRequest), *this);
 }
 
 void ResourceRequest::updateFromSoupRequest(SoupRequest* soupRequest)

Deleted: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (250818 => 250819)


--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp	2019-10-08 09:06:30 UTC (rev 250819)
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "WebKitSoupRequestGeneric.h"
-
-#include "ResourceRequest.h"
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
-
-G_DEFINE_TYPE(WebKitSoupRequestGeneric, webkit_soup_request_generic, SOUP_TYPE_REQUEST)
-
-struct _WebKitSoupRequestGenericPrivate {
-    CString mimeType;
-    goffset contentLength;
-    ResourceRequest resourceRequest;
-};
-
-static void webkitSoupRequestGenericFinalize(GObject* object)
-{
-    WEBKIT_SOUP_REQUEST_GENERIC(object)->priv->~WebKitSoupRequestGenericPrivate();
-    G_OBJECT_CLASS(webkit_soup_request_generic_parent_class)->finalize(object);
-}
-
-static void webkit_soup_request_generic_init(WebKitSoupRequestGeneric* request)
-{
-    WebKitSoupRequestGenericPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_SOUP_REQUEST_GENERIC, WebKitSoupRequestGenericPrivate);
-    request->priv = priv;
-    new (priv) WebKitSoupRequestGenericPrivate();
-}
-
-static void webkitSoupRequestGenericSendAsync(SoupRequest* request, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer userData)
-{
-    WebKitSoupRequestGenericClient* client = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->client;
-    ASSERT(client);
-    client->startRequest(adoptGRef(g_task_new(request, cancellable, callback, userData)));
-}
-
-static GInputStream* webkitSoupRequestGenericSendFinish(SoupRequest* request, GAsyncResult* result, GError** error)
-{
-    g_return_val_if_fail(g_task_is_valid(result, request), nullptr);
-    auto* inputStream = g_task_propagate_pointer(G_TASK(result), error);
-    return inputStream ? G_INPUT_STREAM(inputStream) : nullptr;
-}
-
-static goffset webkitSoupRequestGenericGetContentLength(SoupRequest* request)
-{
-    return WEBKIT_SOUP_REQUEST_GENERIC(request)->priv->contentLength;
-}
-
-static const char* webkitSoupRequestGenericGetContentType(SoupRequest* request)
-{
-    return WEBKIT_SOUP_REQUEST_GENERIC(request)->priv->mimeType.data();
-}
-
-static void webkit_soup_request_generic_class_init(WebKitSoupRequestGenericClass* requestGenericClass)
-{
-    GObjectClass* gObjectClass = G_OBJECT_CLASS(requestGenericClass);
-    gObjectClass->finalize = webkitSoupRequestGenericFinalize;
-
-    SoupRequestClass* requestClass = SOUP_REQUEST_CLASS(requestGenericClass);
-    requestClass->send_async = webkitSoupRequestGenericSendAsync;
-    requestClass->send_finish = webkitSoupRequestGenericSendFinish;
-    requestClass->get_content_length = webkitSoupRequestGenericGetContentLength;
-    requestClass->get_content_type = webkitSoupRequestGenericGetContentType;
-
-    g_type_class_add_private(requestGenericClass, sizeof(WebKitSoupRequestGenericPrivate));
-}
-
-void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric* request, goffset contentLength)
-{
-    request->priv->contentLength = contentLength;
-}
-
-void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric* request, const char* mimeType)
-{
-    request->priv->mimeType = mimeType;
-}
-
-void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric* request, const ResourceRequest& resourceRequest)
-{
-    request->priv->resourceRequest = resourceRequest;
-}
-
-const ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
-{
-    return request->priv->resourceRequest;
-}

Deleted: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (250818 => 250819)


--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h	2019-10-08 09:06:30 UTC (rev 250819)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef WebKitSoupRequestGeneric_h
-#define WebKitSoupRequestGeneric_h
-
-#include "WebKitSoupRequestGenericClient.h"
-#include <glib-object.h>
-#include <libsoup/soup.h>
-
-G_BEGIN_DECLS
-
-namespace WebCore {
-class ResourceRequest;
-}
-
-#define WEBKIT_TYPE_SOUP_REQUEST_GENERIC            (webkit_soup_request_generic_get_type())
-#define WEBKIT_SOUP_REQUEST_GENERIC(object)         (G_TYPE_CHECK_INSTANCE_CAST((object), WEBKIT_TYPE_SOUP_REQUEST_GENERIC, WebKitSoupRequestGeneric))
-#define WEBKIT_IS_SOUP_REQUEST_GENERIC(object)      (G_TYPE_CHECK_INSTANCE_TYPE((object), WEBKIT_TYPE_SOUP_REQUEST_GENERIC))
-#define WEBKIT_SOUP_REQUEST_GENERIC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_SOUP_REQUEST_GENERIC, WebKitSoupRequestGenericClass))
-#define WEBKIT_IS_SOUP_REQUEST_GENERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_SOUP_REQUEST_GENERIC))
-#define WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_SOUP_REQUEST_GENERIC, WebKitSoupRequestGenericClass))
-
-typedef struct _WebKitSoupRequestGeneric WebKitSoupRequestGeneric;
-typedef struct _WebKitSoupRequestGenericClass WebKitSoupRequestGenericClass;
-typedef struct _WebKitSoupRequestGenericPrivate WebKitSoupRequestGenericPrivate;
-
-struct _WebKitSoupRequestGeneric {
-    SoupRequest parent;
-
-    WebKitSoupRequestGenericPrivate *priv;
-};
-
-struct _WebKitSoupRequestGenericClass {
-    SoupRequestClass parent;
-
-    WebCore::WebKitSoupRequestGenericClient* client;
-};
-
-GType webkit_soup_request_generic_get_type();
-
-G_END_DECLS
-
-void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric*, goffset contentLength);
-void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric*, const char* mimeType);
-void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric*, const WebCore::ResourceRequest&);
-const WebCore::ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric*);
-
-#endif // WebKitSoupRequestGeneric_h

Deleted: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h (250818 => 250819)


--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h	2019-10-08 09:06:30 UTC (rev 250819)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include <wtf/glib/GRefPtr.h>
-
-typedef struct _GTask GTask;
-
-namespace WebCore {
-
-class WebKitSoupRequestGenericClient {
-public:
-    virtual void startRequest(GRefPtr<GTask>&&) = 0;
-};
-
-} // namespace WebCore
-

Modified: trunk/Source/WebKit/ChangeLog (250818 => 250819)


--- trunk/Source/WebKit/ChangeLog	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebKit/ChangeLog	2019-10-08 09:06:30 UTC (rev 250819)
@@ -1,3 +1,9 @@
+2019-10-08  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Remove unused WebKitSoupRequestGeneric after r250597
+
+        * NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h:
+
 2019-10-08  Adrian Perez de Castro  <ape...@igalia.com>
 
         [WPE][GTK] Build fails with ENABLE_WEBDRIVER=OFF

Modified: trunk/Source/WebKit/NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h (250818 => 250819)


--- trunk/Source/WebKit/NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h	2019-10-08 08:52:27 UTC (rev 250818)
+++ trunk/Source/WebKit/NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h	2019-10-08 09:06:30 UTC (rev 250819)
@@ -38,15 +38,6 @@
 OBJC_CLASS WKCustomProtocol;
 #endif
 
-#if USE(SOUP)
-#include <wtf/glib/GRefPtr.h>
-
-typedef struct _GCancellable GCancellable;
-typedef struct _GInputStream GInputStream;
-typedef struct _GTask GTask;
-typedef struct _WebKitSoupRequestGeneric WebKitSoupRequestGeneric;
-#endif
-
 namespace IPC {
 class DataReference;
 } // namespace IPC
@@ -77,20 +68,7 @@
 #if PLATFORM(COCOA)
     typedef RetainPtr<WKCustomProtocol> CustomProtocol;
 #endif
-#if USE(SOUP)
-    struct WebSoupRequestAsyncData {
-        WTF_MAKE_STRUCT_FAST_ALLOCATED;
-        WebSoupRequestAsyncData(GRefPtr<GTask>&&, WebKitSoupRequestGeneric*);
-        ~WebSoupRequestAsyncData();
 
-        GRefPtr<GTask> task;
-        WebKitSoupRequestGeneric* request;
-        GRefPtr<GCancellable> cancellable;
-        GRefPtr<GInputStream> stream;
-    };
-    typedef std::unique_ptr<WebSoupRequestAsyncData> CustomProtocol;
-#endif
-
     uint64_t addCustomProtocol(CustomProtocol&&);
     void removeCustomProtocol(uint64_t customProtocolID);
     void startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest&);
@@ -98,8 +76,6 @@
 
 #if PLATFORM(COCOA)
     void registerProtocolClass(NSURLSessionConfiguration*);
-#endif
-#if PLATFORM(COCOA) || USE(SOUP)
     static void networkProcessCreated(NetworkProcess&);
 #endif
 
@@ -132,10 +108,6 @@
     // We return a RetainPtr here because it is unsafe to return a raw pointer since the object might immediately be destroyed from a different thread.
     RetainPtr<WKCustomProtocol> protocolForID(uint64_t customProtocolID);
 #endif
-
-#if USE(SOUP)
-    GRefPtr<GPtrArray> m_registeredSchemes;
-#endif
 };
 
 } // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to