<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185551] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185551">185551</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-15 08:34:02 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Move WebKitSoupRequestGeneric to platform layer
https://bugs.webkit.org/show_bug.cgi?id=145968
Reviewed by Sergio Villar Senin.
Source/WebCore:
* 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.
Source/WebKit2:
* PlatformEfl.cmake: Remove WebKitSoupRequestGeneric.
* PlatformGTK.cmake: Ditto.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplh">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenericcpp">trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenerich">trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenericClienth">trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericcpp">trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenerich">trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericClienth">trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [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.
+
</ins><span class="cx"> 2015-06-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -243,6 +243,7 @@
</span><span class="cx"> platform/network/soup/SocketStreamHandleSoup.cpp
</span><span class="cx"> platform/network/soup/SoupNetworkSession.cpp
</span><span class="cx"> platform/network/soup/SynchronousLoaderClientSoup.cpp
</span><ins>+ platform/network/soup/WebKitSoupRequestGeneric.cpp
</ins><span class="cx">
</span><span class="cx"> platform/posix/FileSystemPOSIX.cpp
</span><span class="cx"> platform/posix/SharedBufferPOSIX.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -183,6 +183,7 @@
</span><span class="cx"> platform/network/soup/SocketStreamHandleSoup.cpp
</span><span class="cx"> platform/network/soup/SoupNetworkSession.cpp
</span><span class="cx"> platform/network/soup/SynchronousLoaderClientSoup.cpp
</span><ins>+ platform/network/soup/WebKitSoupRequestGeneric.cpp
</ins><span class="cx">
</span><span class="cx"> platform/soup/SharedBufferSoup.cpp
</span><span class="cx"> platform/soup/URLSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenericcppfromrev185550trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (from rev 185550, trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp) (0 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+/*
+ * 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;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenerichfromrev185550trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenerich"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (from rev 185550, trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h) (0 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupWebKitSoupRequestGenericClienthfromrev185550trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGenericClient.h (from rev 185550, trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h) (0 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [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:
+
</ins><span class="cx"> 2015-06-15 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix unused private field warning in PageBanner.h
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -210,7 +210,6 @@
</span><span class="cx"> WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
</span><span class="cx"> WebProcess/efl/WebProcessMainEfl.cpp
</span><span class="cx">
</span><del>- WebProcess/soup/WebKitSoupRequestGeneric.cpp
</del><span class="cx"> WebProcess/soup/WebKitSoupRequestInputStream.cpp
</span><span class="cx"> WebProcess/soup/WebProcessSoup.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -337,7 +337,6 @@
</span><span class="cx"> WebProcess/gtk/WebGtkInjectedBundleMain.cpp
</span><span class="cx"> WebProcess/gtk/WebProcessMainGtk.cpp
</span><span class="cx">
</span><del>- WebProcess/soup/WebKitSoupRequestGeneric.cpp
</del><span class="cx"> WebProcess/soup/WebKitSoupRequestInputStream.cpp
</span><span class="cx"> WebProcess/soup/WebProcessSoup.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebKitSoupRequestGeneric.h"
</del><span class="cx"> #include "WebKitSoupRequestInputStream.h"
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><ins>+#include <WebCore/WebKitSoupRequestGeneric.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef CustomProtocolManagerImpl_h
</span><span class="cx"> #define CustomProtocolManagerImpl_h
</span><span class="cx">
</span><del>-#include "WebKitSoupRequestGenericClient.h"
</del><ins>+#include <WebCore/WebKitSoupRequestGenericClient.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> class ChildProcess;
</span><span class="cx"> struct WebSoupRequestAsyncData;
</span><span class="cx">
</span><del>-class CustomProtocolManagerImpl : public WebKitSoupRequestGenericClient {
</del><ins>+class CustomProtocolManagerImpl : public WebCore::WebKitSoupRequestGenericClient {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(CustomProtocolManagerImpl);
</span><span class="cx"> public:
</span><span class="cx"> explicit CustomProtocolManagerImpl(ChildProcess*);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,94 +0,0 @@
</span><del>-/*
- * 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;
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenerich"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h (185550 => 185551)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre>
</div>
</div>
</body>
</html>