<!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>[174803] trunk</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/174803">174803</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-16 18:14:24 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing CUSTOM_PROTOCOLS guard
https://bugs.webkit.org/show_bug.cgi?id=137741
Patch by Pascal Jacquemart <p.jacquemart@samsung.com> on 2014-10-16
Reviewed by Benjamin Poulain.
.:
* Source/cmake/OptionsEfl.cmake:
Source/WebKit2:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::NetworkProcess):
* Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
* Shared/Network/CustomProtocols/CustomProtocolManager.h:
* Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/C/soup/WKAPICastSoup.h:
* UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp:
(WKSoupCustomProtocolRequestManagerGetTypeID):
(WKSoupCustomProtocolRequestManagerSetClient):
* UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
* UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in:
* UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
* UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
* UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp:
* UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h:
* UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp:
* UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h:
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::NetworkProcessProxy):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
(WebKit::WebContext::unregisterSchemeForCustomProtocol):
* UIProcess/WebContext.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::WebProcessProxy):
* UIProcess/WebProcessProxy.h:
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
(WebKit::WebContext::platformInitializeNetworkProcess):
* WebKit2Prefix.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
* WebProcess/soup/WebKitSoupRequestGeneric.cpp:
(webkitSoupRequestGenericSendAsync):
(webkitSoupRequestGenericSendFinish):
* WebProcess/soup/WebKitSoupRequestGeneric.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCocoaCustomProtocolManagerCocoamm">trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh">trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagermessagesin">trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in</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="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerSoupcpp">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp</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>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICsoupWKAPICastSouph">trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICsoupWKSoupCustomProtocolRequestManagercpp">trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolsCustomProtocolManagerProxyh">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolsCustomProtocolManagerProxymessagesin">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolsmacCustomProtocolManagerProxyMacmm">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupCustomProtocolManagerProxySoupcpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagercpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerh">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerClientcpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerClienth">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2Prefixh">trunk/Source/WebKit2/WebKit2Prefix.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</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>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/ChangeLog 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-16 Pascal Jacquemart <p.jacquemart@samsung.com>
+
+ Removing CUSTOM_PROTOCOLS guard
+ https://bugs.webkit.org/show_bug.cgi?id=137741
+
+ Reviewed by Benjamin Poulain.
+
+ * Source/cmake/OptionsEfl.cmake:
+
</ins><span class="cx"> 2014-10-11 KwangHyuk Kim <hyuki.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable WebP support.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2014-10-16 Pascal Jacquemart <p.jacquemart@samsung.com>
+
+ Removing CUSTOM_PROTOCOLS guard
+ https://bugs.webkit.org/show_bug.cgi?id=137741
+
+ Reviewed by Benjamin Poulain.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::NetworkProcess):
+ * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/soup/WKAPICastSoup.h:
+ * UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp:
+ (WKSoupCustomProtocolRequestManagerGetTypeID):
+ (WKSoupCustomProtocolRequestManagerSetClient):
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in:
+ * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
+ * UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::NetworkProcessProxy):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
+ (WebKit::WebContext::unregisterSchemeForCustomProtocol):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::WebProcessProxy):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ (WebKit::WebContext::platformInitializeNetworkProcess):
+ * WebKit2Prefix.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ * WebProcess/soup/WebKitSoupRequestGeneric.cpp:
+ (webkitSoupRequestGenericSendAsync):
+ (webkitSoupRequestGenericSendFinish):
+ * WebProcess/soup/WebKitSoupRequestGeneric.h:
+
</ins><span class="cx"> 2014-10-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash under RemoteLayerTreeHost::getLayer() when closing a tab
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -76,9 +76,7 @@
</span><span class="cx">
</span><span class="cx"> addSupplement<AuthenticationManager>();
</span><span class="cx"> addSupplement<WebCookieManager>();
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> addSupplement<CustomProtocolManager>();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkProcess::~NetworkProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCocoaCustomProtocolManagerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CustomProtocolManager.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #import "ChildProcess.h"
</span><span class="cx"> #import "CustomProtocolManagerMessages.h"
</span><span class="cx"> #import "CustomProtocolManagerProxyMessages.h"
</span><span class="lines">@@ -274,5 +272,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef CustomProtocolManager_h
</span><span class="cx"> #define CustomProtocolManager_h
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "NetworkProcessSupplement.h"
</span><span class="cx"> #include "WebProcessSupplement.h"
</span><span class="lines">@@ -119,6 +117,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #endif // CustomProtocolManager_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> messages -> CustomProtocolManager {
</span><span class="cx"> DidFailWithError(uint64_t customProtocolID, WebCore::ResourceError error)
</span><span class="cx"> DidLoadData(uint64_t customProtocolID, IPC::DataReference data)
</span><span class="lines">@@ -31,5 +29,3 @@
</span><span class="cx"> RegisterScheme(String name)
</span><span class="cx"> UnregisterScheme(String name)
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CustomProtocolManagerImpl.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="lines">@@ -203,5 +201,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #ifndef CustomProtocolManagerImpl_h
</span><span class="cx"> #define CustomProtocolManagerImpl_h
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -69,6 +67,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #endif // CustomProtocolManagerImpl_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CustomProtocolManager.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "CustomProtocolManagerImpl.h"
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><span class="lines">@@ -109,5 +107,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -50,9 +50,7 @@
</span><span class="cx"> encoder << parentBundleDirectoryExtensionHandle;
</span><span class="cx"> #endif
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> encoder << urlSchemesRegisteredForCustomProtocols;
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> encoder << parentProcessName;
</span><span class="cx"> encoder << uiProcessBundleIdentifier;
</span><span class="lines">@@ -94,10 +92,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> if (!decoder.decode(result.shouldUseTestingNetworkSession))
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> if (!decoder.decode(result.parentProcessName))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -69,9 +69,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool shouldUseTestingNetworkSession;
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> Vector<String> urlSchemesRegisteredForCustomProtocols;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> String parentProcessName;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -84,9 +84,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> encoder << urlSchemesRegisteredAsCachePartitioned;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> encoder << urlSchemesRegisteredForCustomProtocols;
</span><del>-#endif
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> encoder << cookiePersistentStoragePath;
</span><span class="cx"> encoder << cookiePersistentStorageType;
</span><span class="lines">@@ -192,10 +190,8 @@
</span><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredAsCachePartitioned))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredForCustomProtocols))
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> if (!decoder.decode(parameters.cookiePersistentStoragePath))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -91,9 +91,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsCachePartitioned;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> Vector<String> urlSchemesRegisteredForCustomProtocols;
</span><del>-#endif
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> String cookiePersistentStoragePath;
</span><span class="cx"> uint32_t cookiePersistentStorageType;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICsoupWKAPICastSouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -35,9 +35,7 @@
</span><span class="cx"> class WebSoupCustomProtocolRequestManager;
</span><span class="cx"> class WebSoupRequestManagerProxy;
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> WK_ADD_API_MAPPING(WKSoupCustomProtocolRequestManagerRef, WebSoupCustomProtocolRequestManager)
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICsoupWKSoupCustomProtocolRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -33,19 +33,10 @@
</span><span class="cx">
</span><span class="cx"> WKTypeID WKSoupCustomProtocolRequestManagerGetTypeID()
</span><span class="cx"> {
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> return toAPI(WebSoupCustomProtocolRequestManager::APIType);
</span><del>-#else
- return 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKSoupCustomProtocolRequestManagerSetClient(WKSoupCustomProtocolRequestManagerRef soupRequestManagerRef, const WKSoupCustomProtocolRequestManagerClientBase* wkClient)
</span><span class="cx"> {
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> toImpl(soupRequestManagerRef)->initializeClient(wkClient);
</span><del>-#else
- UNUSED_PARAM(soupRequestManagerRef);
- UNUSED_PARAM(wkClient);
-#endif
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolsCustomProtocolManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef CustomProtocolManagerProxy_h
</span><span class="cx"> #define CustomProtocolManagerProxy_h
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -67,6 +65,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #endif // CustomProtocolManagerProxy_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolsCustomProtocolManagerProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,11 +20,7 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> messages -> CustomProtocolManagerProxy {
</span><span class="cx"> StartLoading(uint64_t customProtocolID, WebCore::ResourceRequest request)
</span><span class="cx"> StopLoading(uint64_t customProtocolID)
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolsmacCustomProtocolManagerProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CustomProtocolManagerProxy.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #import "ChildProcessProxy.h"
</span><span class="cx"> #import "Connection.h"
</span><span class="cx"> #import "CustomProtocolManagerMessages.h"
</span><span class="lines">@@ -149,5 +147,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupCustomProtocolManagerProxySoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CustomProtocolManagerProxy.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="lines">@@ -50,5 +48,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebSoupCustomProtocolRequestManager.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "APIData.h"
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="lines">@@ -146,5 +144,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #ifndef WebSoupCustomProtocolRequestManager_h
</span><span class="cx"> #define WebSoupCustomProtocolRequestManager_h
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "WebContextSupplement.h"
</span><span class="cx"> #include "WebSoupCustomProtocolRequestManagerClient.h"
</span><span class="lines">@@ -83,6 +81,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #endif // WebSoupCustomProtocolRequestManager_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebSoupCustomProtocolRequestManagerClient.h"
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> bool WebSoupCustomProtocolRequestManagerClient::startLoading(WebSoupCustomProtocolRequestManager* soupRequestManager, uint64_t customProtocolID, const WebCore::ResourceRequest& request)
</span><span class="lines">@@ -41,5 +39,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #ifndef WebSoupCustomProtocolRequestManagerClient_h
</span><span class="cx"> #define WebSoupCustomProtocolRequestManagerClient_h
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #include "APIClient.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKSoupCustomProtocolRequestManager.h"
</span><span class="lines">@@ -49,6 +47,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
</del><span class="cx"> #endif // WebSoupCustomProtocolRequestManagerClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -55,9 +55,7 @@
</span><span class="cx"> NetworkProcessProxy::NetworkProcessProxy(WebContext& webContext)
</span><span class="cx"> : m_webContext(webContext)
</span><span class="cx"> , m_numPendingConnectionRequests(0)
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> , m_customProtocolManagerProxy(this, webContext)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> connect();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -29,15 +29,12 @@
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><ins>+#include "CustomProtocolManagerProxy.h"
</ins><span class="cx"> #include "ProcessLauncher.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerProxy.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "ProcessAssertion.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -98,10 +95,7 @@
</span><span class="cx"> Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span><del>-
-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> std::unique_ptr<ProcessAssertion> m_assertion;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIDownloadClient.h"
</span><span class="cx"> #include "APIHistoryClient.h"
</span><ins>+#include "CustomProtocolManagerMessages.h"
</ins><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -91,15 +92,11 @@
</span><span class="cx"> #include "ServicesController.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerMessages.h"
-#endif
-
</del><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> #include <JavaScriptCore/RemoteInspector.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(SOUP) && ENABLE(CUSTOM_PROTOCOLS)
</del><ins>+#if USE(SOUP)
</ins><span class="cx"> #include "WebSoupCustomProtocolRequestManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -205,7 +202,7 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> addSupplement<WebDatabaseManagerProxy>();
</span><span class="cx"> #endif
</span><del>-#if USE(SOUP) && ENABLE(CUSTOM_PROTOCOLS)
</del><ins>+#if USE(SOUP)
</ins><span class="cx"> addSupplement<WebSoupCustomProtocolRequestManager>();
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="lines">@@ -1011,7 +1008,6 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCORSEnabled(urlScheme));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> HashSet<String>& WebContext::globalURLSchemesWithCustomProtocolHandlers()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashSet<String>> set;
</span><span class="lines">@@ -1039,7 +1035,6 @@
</span><span class="cx"> for (auto* context : allContexts())
</span><span class="cx"> context->unregisterSchemeForCustomProtocol(schemeLower);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> void WebContext::registerURLSchemeAsCachePartitioned(const String& urlScheme)
</span><span class="lines">@@ -1397,7 +1392,6 @@
</span><span class="cx"> m_plugInAutoStartProvider.setAutoStartOriginsFilteringOutEntriesAddedAfterTime(dictionary, time);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> void WebContext::registerSchemeForCustomProtocol(const String& scheme)
</span><span class="cx"> {
</span><span class="cx"> sendToNetworkingProcess(Messages::CustomProtocolManager::RegisterScheme(scheme));
</span><span class="lines">@@ -1407,7 +1401,6 @@
</span><span class="cx"> {
</span><span class="cx"> sendToNetworkingProcess(Messages::CustomProtocolManager::UnregisterScheme(scheme));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -335,14 +335,12 @@
</span><span class="cx"> bool isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const;
</span><span class="cx"> void resetHSTSHosts();
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> void registerSchemeForCustomProtocol(const String&);
</span><span class="cx"> void unregisterSchemeForCustomProtocol(const String&);
</span><span class="cx">
</span><span class="cx"> static HashSet<String>& globalURLSchemesWithCustomProtocolHandlers();
</span><span class="cx"> static void registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
</span><span class="cx"> static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void updateProcessSuppressionState() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -92,9 +92,7 @@
</span><span class="cx"> : m_responsivenessTimer(this)
</span><span class="cx"> , m_context(context)
</span><span class="cx"> , m_mayHaveUniversalFileReadSandboxExtension(false)
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> , m_customProtocolManagerProxy(this, context)
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> , m_processSuppressionEnabled(false)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APISession.h"
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><ins>+#include "CustomProtocolManagerProxy.h"
</ins><span class="cx"> #include "MessageReceiverMap.h"
</span><span class="cx"> #include "PlatformProcessIdentifier.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><span class="lines">@@ -43,10 +44,6 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerProxy.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -224,10 +221,7 @@
</span><span class="cx"> HashSet<WebUserContentControllerProxy*> m_webUserContentControllerProxies;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span><del>-
-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> HashSet<uint64_t> m_processSuppressiblePages;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -208,10 +208,8 @@
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> if (!m_usesNetworkProcess) {
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
</span><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
</span><del>-#endif
</del><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -245,10 +243,8 @@
</span><span class="cx"> parameters.parentProcessName = [[NSProcessInfo processInfo] processName];
</span><span class="cx"> parameters.uiProcessBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
</span><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> parameters.httpProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPProxyDefaultsKey];
</span><span class="cx"> parameters.httpsProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPSProxyDefaultsKey];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2Prefix.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx">
</span><span class="cx"> #define ENABLE_MEMORY_SAMPLER 1
</span><span class="cx">
</span><del>-#define ENABLE_CUSTOM_PROTOCOLS 1
-
</del><span class="cx"> #define ENABLE_SHAREABLE_RESOURCE 1
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="lines">@@ -80,7 +78,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define ENABLE_NETWORK_PROCESS 1
</span><del>-#define ENABLE_CUSTOM_PROTOCOLS 1
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "AuthenticationManager.h"
</span><ins>+#include "CustomProtocolManager.h"
</ins><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "EventDispatcher.h"
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="lines">@@ -100,10 +101,6 @@
</span><span class="cx"> #include "SecItemShim.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManager.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> #include "WebToDatabaseProcessConnection.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -194,9 +191,7 @@
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> addSupplement<WebNotificationManager>();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> addSupplement<CustomProtocolManager>();
</span><del>-#endif
</del><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> addSupplement<WebBatteryManager>();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -46,23 +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>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
</span><span class="cx"> ASSERT(customProtocolManager);
</span><span class="cx"> customProtocolManager->send(g_task_new(request, cancellable, callback, userData));
</span><del>-#endif
</del><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><span class="cx"> g_return_val_if_fail(g_task_is_valid(result, request), 0);
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
</span><span class="cx"> ASSERT(customProtocolManager);
</span><span class="cx"> return customProtocolManager->finish(G_TASK(result), error);
</span><del>-#else
- return nullptr;
-#endif
</del><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 (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -20,13 +20,10 @@
</span><span class="cx"> #ifndef WebKitSoupRequestGeneric_h
</span><span class="cx"> #define WebKitSoupRequestGeneric_h
</span><span class="cx">
</span><ins>+#include "CustomProtocolManagerImpl.h"
</ins><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerImpl.h"
-#endif
-
</del><span class="cx"> G_BEGIN_DECLS
</span><span class="cx">
</span><span class="cx"> #define WEBKIT_TYPE_SOUP_REQUEST_GENERIC (webkit_soup_request_generic_get_type())
</span><span class="lines">@@ -49,9 +46,7 @@
</span><span class="cx"> struct _WebKitSoupRequestGenericClass {
</span><span class="cx"> SoupRequestClass parent;
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
</del><span class="cx"> WebKit::CustomProtocolManagerImpl* customProtocolManager;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> GType webkit_soup_request_generic_get_type();
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (174802 => 174803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-10-17 01:14:24 UTC (rev 174803)
</span><span class="lines">@@ -308,7 +308,5 @@
</span><span class="cx"> set(HAVE_LLVM ON)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_definitions(-DENABLE_CUSTOM_PROTOCOLS=1)
-
</del><span class="cx"> # [E]WebKit2 tests need a hint to find out where processes such as WebProcess are located at.
</span><span class="cx"> add_definitions(-DWEBKIT_EXEC_PATH=\"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\")
</span></span></pre>
</div>
</div>
</body>
</html>