Diff
Modified: trunk/Source/WebCore/ChangeLog (185550 => 185551)
--- trunk/Source/WebCore/ChangeLog 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebCore/ChangeLog 2015-06-15 15:34:02 UTC (rev 185551)
@@ -1,3 +1,25 @@
+2015-06-15 Carlos Garcia Campos <[email protected]>
+
+ [SOUP] Move WebKitSoupRequestGeneric to platform layer
+ https://bugs.webkit.org/show_bug.cgi?id=145968
+
+ Reviewed by Sergio Villar Senin.
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * platform/network/soup/WebKitSoupRequestGeneric.cpp: Renamed from Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp.
+ (webkitSoupRequestGenericFinalize):
+ (webkit_soup_request_generic_init):
+ (webkitSoupRequestGenericSendAsync):
+ (webkitSoupRequestGenericSendFinish):
+ (webkitSoupRequestGenericGetContentLength):
+ (webkitSoupRequestGenericGetContentType):
+ (webkit_soup_request_generic_class_init):
+ (webkitSoupRequestGenericSetContentLength):
+ (webkitSoupRequestGenericSetContentType):
+ * platform/network/soup/WebKitSoupRequestGeneric.h: Renamed from Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h.
+ * platform/network/soup/WebKitSoupRequestGenericClient.h: Renamed from Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h.
+
2015-06-13 Chris Dumez <[email protected]>
[WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
Modified: trunk/Source/WebCore/PlatformEfl.cmake (185550 => 185551)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-06-15 15:34:02 UTC (rev 185551)
@@ -243,6 +243,7 @@
platform/network/soup/SocketStreamHandleSoup.cpp
platform/network/soup/SoupNetworkSession.cpp
platform/network/soup/SynchronousLoaderClientSoup.cpp
+ platform/network/soup/WebKitSoupRequestGeneric.cpp
platform/posix/FileSystemPOSIX.cpp
platform/posix/SharedBufferPOSIX.cpp
Modified: trunk/Source/WebCore/PlatformGTK.cmake (185550 => 185551)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-06-15 15:34:02 UTC (rev 185551)
@@ -183,6 +183,7 @@
platform/network/soup/SocketStreamHandleSoup.cpp
platform/network/soup/SoupNetworkSession.cpp
platform/network/soup/SynchronousLoaderClientSoup.cpp
+ platform/network/soup/WebKitSoupRequestGeneric.cpp
platform/soup/SharedBufferSoup.cpp
platform/soup/URLSoup.cpp
Copied: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (from rev 185550, trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp) (0 => 185551)
--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 15:34:02 UTC (rev 185551)
@@ -0,0 +1,94 @@
+/*
+ * 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 <wtf/text/CString.h>
+
+using namespace WebCore;
+
+G_DEFINE_TYPE(WebKitSoupRequestGeneric, webkit_soup_request_generic, SOUP_TYPE_REQUEST)
+
+struct _WebKitSoupRequestGenericPrivate {
+ CString mimeType;
+ goffset contentLength;
+};
+
+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->start(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);
+ WebKitSoupRequestGenericClient* client = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->client;
+ ASSERT(client);
+ return client->finish(G_TASK(result), error);
+}
+
+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;
+}
Copied: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (from rev 185550, trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h) (0 => 185551)
--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (rev 0)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h 2015-06-15 15:34:02 UTC (rev 185551)
@@ -0,0 +1,59 @@
+/*
+ * 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
+
+#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();
+
+void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric*, goffset contentLength);
+void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric*, const char* mimeType);
+
+G_END_DECLS
+
+#endif // WebKitSoupRequestGeneric_h
Copied: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h (from rev 185550, trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h) (0 => 185551)
--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h (rev 0)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h 2015-06-15 15:34:02 UTC (rev 185551)
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+#ifndef WebKitSoupRequestGenericClient_h
+#define WebKitSoupRequestGenericClient_h
+
+typedef struct _GError GError;
+typedef struct _GInputStream GInputStream;
+typedef struct _GTask GTask;
+
+namespace WebCore {
+
+class WebKitSoupRequestGenericClient {
+public:
+ virtual void start(GTask*) = 0;
+ virtual GInputStream* finish(GTask*, GError**) = 0;
+};
+
+} // namespace WebCore
+
+#endif // WebKitSoupRequestGenericClient_h
Modified: trunk/Source/WebKit2/ChangeLog (185550 => 185551)
--- trunk/Source/WebKit2/ChangeLog 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-15 15:34:02 UTC (rev 185551)
@@ -1,3 +1,15 @@
+2015-06-15 Carlos Garcia Campos <[email protected]>
+
+ [SOUP] Move WebKitSoupRequestGeneric to platform layer
+ https://bugs.webkit.org/show_bug.cgi?id=145968
+
+ Reviewed by Sergio Villar Senin.
+
+ * PlatformEfl.cmake: Remove WebKitSoupRequestGeneric.
+ * PlatformGTK.cmake: Ditto.
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
+
2015-06-15 Csaba Osztrogonác <[email protected]>
Fix unused private field warning in PageBanner.h
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (185550 => 185551)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-06-15 15:34:02 UTC (rev 185551)
@@ -210,7 +210,6 @@
WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
WebProcess/efl/WebProcessMainEfl.cpp
- WebProcess/soup/WebKitSoupRequestGeneric.cpp
WebProcess/soup/WebKitSoupRequestInputStream.cpp
WebProcess/soup/WebProcessSoup.cpp
)
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (185550 => 185551)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-15 15:34:02 UTC (rev 185551)
@@ -337,7 +337,6 @@
WebProcess/gtk/WebGtkInjectedBundleMain.cpp
WebProcess/gtk/WebProcessMainGtk.cpp
- WebProcess/soup/WebKitSoupRequestGeneric.cpp
WebProcess/soup/WebKitSoupRequestInputStream.cpp
WebProcess/soup/WebProcessSoup.cpp
)
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (185550 => 185551)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-15 15:34:02 UTC (rev 185551)
@@ -24,12 +24,12 @@
#include "CustomProtocolManagerProxyMessages.h"
#include "DataReference.h"
#include "WebCoreArgumentCoders.h"
-#include "WebKitSoupRequestGeneric.h"
#include "WebKitSoupRequestInputStream.h"
#include <WebCore/ResourceError.h>
#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
#include <WebCore/SoupNetworkSession.h>
+#include <WebCore/WebKitSoupRequestGeneric.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h (185550 => 185551)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2015-06-15 15:34:02 UTC (rev 185551)
@@ -20,7 +20,7 @@
#ifndef CustomProtocolManagerImpl_h
#define CustomProtocolManagerImpl_h
-#include "WebKitSoupRequestGenericClient.h"
+#include <WebCore/WebKitSoupRequestGenericClient.h>
#include <wtf/HashMap.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/text/WTFString.h>
@@ -39,7 +39,7 @@
class ChildProcess;
struct WebSoupRequestAsyncData;
-class CustomProtocolManagerImpl : public WebKitSoupRequestGenericClient {
+class CustomProtocolManagerImpl : public WebCore::WebKitSoupRequestGenericClient {
WTF_MAKE_NONCOPYABLE(CustomProtocolManagerImpl);
public:
explicit CustomProtocolManagerImpl(ChildProcess*);
Deleted: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp (185550 => 185551)
--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 15:34:02 UTC (rev 185551)
@@ -1,94 +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 <wtf/text/CString.h>
-
-using namespace WebKit;
-
-G_DEFINE_TYPE(WebKitSoupRequestGeneric, webkit_soup_request_generic, SOUP_TYPE_REQUEST)
-
-struct _WebKitSoupRequestGenericPrivate {
- CString mimeType;
- goffset contentLength;
-};
-
-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->start(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);
- WebKitSoupRequestGenericClient* client = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->client;
- ASSERT(client);
- return client->finish(G_TASK(result), error);
-}
-
-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;
-}
Deleted: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h (185550 => 185551)
--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2015-06-15 15:34:02 UTC (rev 185551)
@@ -1,59 +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
-
-#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;
-
- WebKit::WebKitSoupRequestGenericClient* client;
-};
-
-GType webkit_soup_request_generic_get_type();
-
-void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric*, goffset contentLength);
-void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric*, const char* mimeType);
-
-G_END_DECLS
-
-#endif // WebKitSoupRequestGeneric_h
Deleted: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h (185550 => 185551)
--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h 2015-06-15 13:09:39 UTC (rev 185550)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h 2015-06-15 15:34:02 UTC (rev 185551)
@@ -1,37 +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.
- */
-
-#ifndef WebKitSoupRequestGenericClient_h
-#define WebKitSoupRequestGenericClient_h
-
-typedef struct _GError GError;
-typedef struct _GInputStream GInputStream;
-typedef struct _GTask GTask;
-
-namespace WebKit {
-
-class WebKitSoupRequestGenericClient {
-public:
- virtual void start(GTask*) = 0;
- virtual GInputStream* finish(GTask*, GError**) = 0;
-};
-
-} // namespace WebKit
-
-#endif // WebKitSoupRequestGenericClient_h
