<!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>[162190] 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/162190">162190</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-16 23:50:46 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Add stubs for CustomProtocol classes
https://bugs.webkit.org/show_bug.cgi?id=126343
Reviewed by Gustavo Noronha Silva.
* CMakeLists.txt:
* GNUmakefile.am:
* GNUmakefile.list.am:
* PlatformGTK.cmake:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp: Added.
(WebKit::generateCustomProtocolID):
(WebKit::WebSoupRequestAsyncData::WebSoupRequestAsyncData):
(WebKit::WebSoupRequestAsyncData::~WebSoupRequestAsyncData):
(WebKit::WebSoupRequestAsyncData::requestFailed):
(WebKit::WebSoupRequestAsyncData::releaseTask):
(WebKit::CustomProtocolManager::supplementName):
(WebKit::CustomProtocolManager::CustomProtocolManager):
(WebKit::CustomProtocolManager::initializeConnection):
(WebKit::CustomProtocolManager::initialize):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode): Move
urlSchemesRegisteredForCustomProtocols encoding out of platform
ifdefs, since it's already guarded by ENABLE(CUSTOM_PROTOCOLS).
(WebKit::NetworkProcessCreationParameters::decode): Ditto.
* Shared/Network/NetworkProcessCreationParameters.h: Ditto.
* UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp: Added.
(WebKit::CustomProtocolManagerProxy::CustomProtocolManagerProxy):
(WebKit::CustomProtocolManagerProxy::startLoading):
(WebKit::CustomProtocolManagerProxy::stopLoading):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefileam">trunk/Source/WebKit2/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefilelistam">trunk/Source/WebKit2/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/</li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerSoupcpp">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp</a></li>
<li>trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/</li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupCustomProtocolManagerProxySoupcpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/InspectorServer"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Launcher"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Network"
</span><ins>+ "${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Notifications"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Plugins"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Storage"
</span><span class="lines">@@ -589,6 +590,8 @@
</span><span class="cx">
</span><span class="cx"> Shared/Plugins/NPObjectMessageReceiver.messages.in
</span><span class="cx">
</span><ins>+ Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
+
</ins><span class="cx"> UIProcess/DrawingAreaProxy.messages.in
</span><span class="cx"> UIProcess/WebApplicationCacheManagerProxy.messages.in
</span><span class="cx"> UIProcess/WebBatteryManagerProxy.messages.in
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-01-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Add stubs for CustomProtocol classes
+ https://bugs.webkit.org/show_bug.cgi?id=126343
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * PlatformGTK.cmake:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp: Added.
+ (WebKit::generateCustomProtocolID):
+ (WebKit::WebSoupRequestAsyncData::WebSoupRequestAsyncData):
+ (WebKit::WebSoupRequestAsyncData::~WebSoupRequestAsyncData):
+ (WebKit::WebSoupRequestAsyncData::requestFailed):
+ (WebKit::WebSoupRequestAsyncData::releaseTask):
+ (WebKit::CustomProtocolManager::supplementName):
+ (WebKit::CustomProtocolManager::CustomProtocolManager):
+ (WebKit::CustomProtocolManager::initializeConnection):
+ (WebKit::CustomProtocolManager::initialize):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode): Move
+ urlSchemesRegisteredForCustomProtocols encoding out of platform
+ ifdefs, since it's already guarded by ENABLE(CUSTOM_PROTOCOLS).
+ (WebKit::NetworkProcessCreationParameters::decode): Ditto.
+ * Shared/Network/NetworkProcessCreationParameters.h: Ditto.
+ * UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp: Added.
+ (WebKit::CustomProtocolManagerProxy::CustomProtocolManagerProxy):
+ (WebKit::CustomProtocolManagerProxy::startLoading):
+ (WebKit::CustomProtocolManagerProxy::stopLoading):
+
</ins><span class="cx"> 2014-01-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> On iOS, zooming in with a TileController-backed main frame makes hundreds of tiles
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.am (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.am 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/Launcher \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/Launcher/gtk \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/Network \
</span><ins>+ -I$(srcdir)/Source/WebKit2/UIProcess/Network/CustomProtocols \
</ins><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/Notifications \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/Plugins \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/Plugins/unix \
</span><span class="lines">@@ -414,6 +415,7 @@
</span><span class="cx"> $(WebKit2)/PluginProcess \
</span><span class="cx"> $(WebKit2)/Shared \
</span><span class="cx"> $(WebKit2)/Shared/Authentication \
</span><ins>+ $(WebKit2)/Shared/Network/CustomProtocols \
</ins><span class="cx"> $(WebKit2)/Shared/Plugins \
</span><span class="cx"> $(WebKit2)/UIProcess \
</span><span class="cx"> $(WebKit2)/UIProcess/ApplicationCache \
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.list.am (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> DerivedSources/WebKit2/AuthenticationManagerMessages.h \
</span><span class="cx"> DerivedSources/WebKit2/CustomProtocolManagerProxyMessageReceiver.cpp \
</span><span class="cx"> DerivedSources/WebKit2/CustomProtocolManagerProxyMessages.h \
</span><ins>+ DerivedSources/WebKit2/CustomProtocolManagerMessageReceiver.cpp \
+ DerivedSources/WebKit2/CustomProtocolManagerMessages.h \
</ins><span class="cx"> DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
</span><span class="cx"> DerivedSources/WebKit2/DownloadProxyMessages.h \
</span><span class="cx"> DerivedSources/WebKit2/DrawingAreaMessageReceiver.cpp \
</span><span class="lines">@@ -401,6 +403,7 @@
</span><span class="cx"> Source/WebKit2/Shared/NativeWebMouseEvent.h \
</span><span class="cx"> Source/WebKit2/Shared/NativeWebWheelEvent.h \
</span><span class="cx"> Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h \
</span><ins>+ Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp \
</ins><span class="cx"> Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp \
</span><span class="cx"> Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h \
</span><span class="cx"> Source/WebKit2/Shared/Network/NetworkProcessSupplement.h \
</span><span class="lines">@@ -832,6 +835,8 @@
</span><span class="cx"> Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
</span><ins>+ Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h \
+ Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp \
</ins><span class="cx"> Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h \
</span><span class="cx"> Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp \
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx">
</span><span class="cx"> Shared/Downloads/soup/DownloadSoup.cpp
</span><span class="cx">
</span><ins>+ Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
+
</ins><span class="cx"> Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
</span><span class="cx">
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="lines">@@ -233,6 +235,8 @@
</span><span class="cx">
</span><span class="cx"> UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
</span><span class="cx">
</span><ins>+ UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
+
</ins><span class="cx"> UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
</span><span class="cx"> UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerSoupcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (0 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 "CustomProtocolManager.h"
+
+#if ENABLE(CUSTOM_PROTOCOLS)
+
+#include "ChildProcess.h"
+#include "CustomProtocolManagerMessages.h"
+#include "CustomProtocolManagerProxyMessages.h"
+#include "WebCoreArgumentCoders.h"
+#include "WebProcessCreationParameters.h"
+#include <WebCore/NotImplemented.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
+#include <WebCore/URL.h>
+
+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessCreationParameters.h"
+#endif
+
+namespace WebKit {
+
+const char* CustomProtocolManager::supplementName()
+{
+ return "CustomProtocolManager";
+}
+
+CustomProtocolManager::CustomProtocolManager(ChildProcess* childProcess)
+ : m_childProcess(childProcess)
+ , m_messageQueue(WorkQueue::create("com.apple.WebKit.CustomProtocolManager"))
+{
+}
+
+void CustomProtocolManager::initializeConnection(IPC::Connection* connection)
+{
+ connection->addWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName(), m_messageQueue.get(), this);
+}
+
+void CustomProtocolManager::initialize(const WebProcessCreationParameters&)
+{
+}
+
+#if ENABLE(NETWORK_PROCESS)
+void CustomProtocolManager::initialize(const NetworkProcessCreationParameters&)
+{
+}
+#endif
+
+void CustomProtocolManager::registerScheme(const String&)
+{
+ notImplemented();
+}
+
+void CustomProtocolManager::unregisterScheme(const String&)
+{
+ notImplemented();
+}
+
+bool CustomProtocolManager::supportsScheme(const String&)
+{
+ notImplemented();
+ return false;
+}
+
+void CustomProtocolManager::didFailWithError(uint64_t, const WebCore::ResourceError&)
+{
+ notImplemented();
+}
+
+void CustomProtocolManager::didLoadData(uint64_t, const IPC::DataReference&)
+{
+ notImplemented();
+}
+
+void CustomProtocolManager::didReceiveResponse(uint64_t, const WebCore::ResourceResponse&, uint32_t)
+{
+ notImplemented();
+}
+
+void CustomProtocolManager::didFinishLoading(uint64_t)
+{
+ notImplemented();
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(CUSTOM_PROTOCOLS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -43,14 +43,14 @@
</span><span class="cx"> encoder << diskCacheDirectory;
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><ins>+#if ENABLE(CUSTOM_PROTOCOLS)
+ encoder << urlSchemesRegisteredForCustomProtocols;
+#endif
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> encoder << parentProcessName;
</span><span class="cx"> encoder << uiProcessBundleIdentifier;
</span><span class="cx"> encoder << nsURLCacheMemoryCapacity;
</span><span class="cx"> encoder << nsURLCacheDiskCapacity;
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
- encoder << urlSchemesRegisteredForCustomProtocols;
-#endif
</del><span class="cx"> encoder << httpProxy;
</span><span class="cx"> encoder << httpsProxy;
</span><span class="cx"> #endif
</span><span class="lines">@@ -75,6 +75,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.shouldUseTestingNetworkSession))
</span><span class="cx"> return false;
</span><ins>+#if ENABLE(CUSTOM_PROTOCOLS)
+ if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
+ return false;
+#endif
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (!decoder.decode(result.parentProcessName))
</span><span class="cx"> return false;
</span><span class="lines">@@ -84,10 +88,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.nsURLCacheDiskCapacity))
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
- if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
- return false;
-#endif
</del><span class="cx"> if (!decoder.decode(result.httpProxy))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.httpsProxy))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (162189 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-01-17 07:31:30 UTC (rev 162189)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -58,16 +58,16 @@
</span><span class="cx">
</span><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span><ins>+#if ENABLE(CUSTOM_PROTOCOLS)
+ Vector<String> urlSchemesRegisteredForCustomProtocols;
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> String parentProcessName;
</span><span class="cx"> String uiProcessBundleIdentifier;
</span><span class="cx"> uint64_t nsURLCacheMemoryCapacity;
</span><span class="cx"> uint64_t nsURLCacheDiskCapacity;
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
- Vector<String> urlSchemesRegisteredForCustomProtocols;
-#endif
-
</del><span class="cx"> String httpProxy;
</span><span class="cx"> String httpsProxy;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupCustomProtocolManagerProxySoupcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (0 => 162190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2014-01-17 07:50:46 UTC (rev 162190)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 "CustomProtocolManagerProxy.h"
+
+#if ENABLE(CUSTOM_PROTOCOLS)
+
+#include "ChildProcessProxy.h"
+#include "CustomProtocolManagerMessages.h"
+#include "CustomProtocolManagerProxyMessages.h"
+#include <WebCore/NotImplemented.h>
+#include <WebCore/ResourceRequest.h>
+
+namespace WebKit {
+
+CustomProtocolManagerProxy::CustomProtocolManagerProxy(ChildProcessProxy* childProcessProxy)
+ : m_childProcessProxy(childProcessProxy)
+{
+ ASSERT(m_childProcessProxy);
+ m_childProcessProxy->addMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName(), *this);
+}
+
+void CustomProtocolManagerProxy::startLoading(uint64_t, const WebCore::ResourceRequest&)
+{
+ notImplemented();
+}
+
+void CustomProtocolManagerProxy::stopLoading(uint64_t)
+{
+ notImplemented();
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(CUSTOM_PROTOCOLS)
</ins></span></pre>
</div>
</div>
</body>
</html>