<!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>[185548] trunk/Source/WebKit2</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/185548">185548</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-15 04:09:08 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Make WebKitSoupRequestGeneric independent from CustomProtocolManagerImpl
https://bugs.webkit.org/show_bug.cgi?id=145966
Reviewed by Sergio Villar Senin.
Add WebKitSoupRequestGenericClient with start and finish methods,
that are implemented by WebKitSoupRequestGeneric.
This allows us to move WebKitSoupRequestGeneric to platform layer.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
(WebKit::CustomProtocolManagerImpl::registerScheme):
(WebKit::CustomProtocolManagerImpl::start):
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
* WebProcess/soup/WebKitSoupRequestGeneric.cpp:
(webkitSoupRequestGenericSendAsync):
(webkitSoupRequestGenericSendFinish):
* WebProcess/soup/WebKitSoupRequestGeneric.h:
* WebProcess/soup/WebKitSoupRequestGenericClient.h: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
<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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericClienth">trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185547 => 185548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-15 04:13:02 UTC (rev 185547)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-15 11:09:08 UTC (rev 185548)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Make WebKitSoupRequestGeneric independent from CustomProtocolManagerImpl
+ https://bugs.webkit.org/show_bug.cgi?id=145966
+
+ Reviewed by Sergio Villar Senin.
+
+ Add WebKitSoupRequestGenericClient with start and finish methods,
+ that are implemented by WebKitSoupRequestGeneric.
+ This allows us to move WebKitSoupRequestGeneric to platform layer.
+
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ (WebKit::CustomProtocolManagerImpl::registerScheme):
+ (WebKit::CustomProtocolManagerImpl::start):
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
+ * WebProcess/soup/WebKitSoupRequestGeneric.cpp:
+ (webkitSoupRequestGenericSendAsync):
+ (webkitSoupRequestGenericSendFinish):
+ * WebProcess/soup/WebKitSoupRequestGeneric.h:
+ * WebProcess/soup/WebKitSoupRequestGenericClient.h: Added.
+
</ins><span class="cx"> 2015-06-14 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the build.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (185547 => 185548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-15 04:13:02 UTC (rev 185547)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-15 11:09:08 UTC (rev 185548)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> SoupSession* session = WebCore::SoupNetworkSession::defaultSession().soupSession();
</span><span class="cx"> SoupRequestClass* genericRequestClass = static_cast<SoupRequestClass*>(g_type_class_ref(WEBKIT_TYPE_SOUP_REQUEST_GENERIC));
</span><span class="cx"> genericRequestClass->schemes = const_cast<const char**>(reinterpret_cast<char**>(m_schemes->pdata));
</span><del>- static_cast<WebKitSoupRequestGenericClass*>(g_type_class_ref(WEBKIT_TYPE_SOUP_REQUEST_GENERIC))->customProtocolManager = this;
</del><ins>+ static_cast<WebKitSoupRequestGenericClass*>(g_type_class_ref(WEBKIT_TYPE_SOUP_REQUEST_GENERIC))->client = this;
</ins><span class="cx"> soup_session_add_feature_by_type(session, WEBKIT_TYPE_SOUP_REQUEST_GENERIC);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> m_customProtocolMap.remove(customProtocolID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CustomProtocolManagerImpl::send(GTask* task)
</del><ins>+void CustomProtocolManagerImpl::start(GTask* task)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t customProtocolID = generateCustomProtocolID();
</span><span class="cx"> WebKitSoupRequestGeneric* request = WEBKIT_SOUP_REQUEST_GENERIC(g_task_get_source_object(task));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h (185547 => 185548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2015-06-15 04:13:02 UTC (rev 185547)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2015-06-15 11:09:08 UTC (rev 185548)
</span><span class="lines">@@ -20,13 +20,11 @@
</span><span class="cx"> #ifndef CustomProtocolManagerImpl_h
</span><span class="cx"> #define CustomProtocolManagerImpl_h
</span><span class="cx">
</span><ins>+#include "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="cx">
</span><del>-typedef struct _GTask GTask;
-typedef struct _GInputStream GInputStream;
-
</del><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="cx"> } // namespace IPC
</span><span class="lines">@@ -41,7 +39,7 @@
</span><span class="cx"> class ChildProcess;
</span><span class="cx"> struct WebSoupRequestAsyncData;
</span><span class="cx">
</span><del>-class CustomProtocolManagerImpl {
</del><ins>+class CustomProtocolManagerImpl : public WebKitSoupRequestGenericClient {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(CustomProtocolManagerImpl);
</span><span class="cx"> public:
</span><span class="cx"> explicit CustomProtocolManagerImpl(ChildProcess*);
</span><span class="lines">@@ -55,11 +53,10 @@
</span><span class="cx"> void didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse&);
</span><span class="cx"> void didFinishLoading(uint64_t customProtocolID);
</span><span class="cx">
</span><del>- // SoupRequest implementation.
- void send(GTask*);
- GInputStream* finish(GTask*, GError**);
-
</del><span class="cx"> private:
</span><ins>+ void start(GTask*) final override;
+ GInputStream* finish(GTask*, GError**) final override;
+
</ins><span class="cx"> ChildProcess* m_childProcess;
</span><span class="cx"> GRefPtr<GPtrArray> m_schemes;
</span><span class="cx"> HashMap<uint64_t, std::unique_ptr<WebSoupRequestAsyncData>> m_customProtocolMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp (185547 => 185548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 04:13:02 UTC (rev 185547)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2015-06-15 11:09:08 UTC (rev 185548)
</span><span class="lines">@@ -46,17 +46,17 @@
</span><span class="cx">
</span><span class="cx"> static void webkitSoupRequestGenericSendAsync(SoupRequest* request, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer userData)
</span><span class="cx"> {
</span><del>- CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
- ASSERT(customProtocolManager);
- customProtocolManager->send(g_task_new(request, cancellable, callback, userData));
</del><ins>+ WebKitSoupRequestGenericClient* client = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->client;
+ ASSERT(client);
+ client->start(g_task_new(request, cancellable, callback, userData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static GInputStream* webkitSoupRequestGenericSendFinish(SoupRequest* request, GAsyncResult* result, GError** error)
</span><span class="cx"> {
</span><del>- g_return_val_if_fail(g_task_is_valid(result, request), 0);
- CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
- ASSERT(customProtocolManager);
- return customProtocolManager->finish(G_TASK(result), error);
</del><ins>+ 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static goffset webkitSoupRequestGenericGetContentLength(SoupRequest* request)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenerich"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h (185547 => 185548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2015-06-15 04:13:02 UTC (rev 185547)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2015-06-15 11:09:08 UTC (rev 185548)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef WebKitSoupRequestGeneric_h
</span><span class="cx"> #define WebKitSoupRequestGeneric_h
</span><span class="cx">
</span><del>-#include "CustomProtocolManagerImpl.h"
</del><ins>+#include "WebKitSoupRequestGenericClient.h"
</ins><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx">
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> struct _WebKitSoupRequestGenericClass {
</span><span class="cx"> SoupRequestClass parent;
</span><span class="cx">
</span><del>- WebKit::CustomProtocolManagerImpl* customProtocolManager;
</del><ins>+ WebKit::WebKitSoupRequestGenericClient* client;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> GType webkit_soup_request_generic_get_type();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h (0 => 185548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGenericClient.h 2015-06-15 11:09:08 UTC (rev 185548)
</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 WebKit {
+
+class WebKitSoupRequestGenericClient {
+public:
+ virtual void start(GTask*) = 0;
+ virtual GInputStream* finish(GTask*, GError**) = 0;
+};
+
+} // namespace WebKit
+
+#endif // WebKitSoupRequestGenericClient_h
</ins></span></pre>
</div>
</div>
</body>
</html>