<!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>[211014] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211014">211014</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-21 01:22:39 -0800 (Sat, 21 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/211012">r211012</a>.
It caused a lot of crashes in the network process
Reverted changeset:
"[SOUP] Custom protocols don't work in private browsing mode"
https://bugs.webkit.org/show_bug.cgi?id=167236
http://trac.webkit.org/changeset/211012</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessCustomProtocolssoupCustomProtocolManagerSoupcpp">trunk/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211013 => 211014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-21 07:52:20 UTC (rev 211013)
+++ trunk/Source/WebCore/ChangeLog 2017-01-21 09:22:39 UTC (rev 211014)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed, rolling out r211012.
+
+ It caused a lot of crashes in the network process
+
+ Reverted changeset:
+
+ "[SOUP] Custom protocols don't work in private browsing mode"
+ https://bugs.webkit.org/show_bug.cgi?id=167236
+ http://trac.webkit.org/changeset/211012
+
</ins><span class="cx"> 2017-01-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove never changing IndexedDB RuntimeEnabledFeature
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (211013 => 211014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-01-21 07:52:20 UTC (rev 211013)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-01-21 09:22:39 UTC (rev 211014)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> static bool gIgnoreTLSErrors;
</span><span class="cx"> static CString gInitialAcceptLanguages;
</span><span class="cx"> static SoupNetworkProxySettings gProxySettings;
</span><del>-static GType gCustomProtocolRequestType;
</del><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> inline static void soupLogPrinter(SoupLogger*, SoupLoggerLogLevel, char direction, const char* data, gpointer)
</span><span class="lines">@@ -141,8 +140,6 @@
</span><span class="cx"> SOUP_SESSION_SSL_STRICT, FALSE,
</span><span class="cx"> nullptr);
</span><span class="cx">
</span><del>- setupCustomProtocols();
-
</del><span class="cx"> if (!gInitialAcceptLanguages.isNull())
</span><span class="cx"> setAcceptLanguages(gInitialAcceptLanguages);
</span><span class="cx">
</span><span class="lines">@@ -292,19 +289,6 @@
</span><span class="cx"> g_object_set(m_soupSession.get(), "accept-language", languages.data(), nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SoupNetworkSession::setCustomProtocolRequestType(GType requestType)
-{
- ASSERT(g_type_is_a(requestType, SOUP_TYPE_REQUEST));
- gCustomProtocolRequestType = requestType;
-}
-
-void SoupNetworkSession::setupCustomProtocols()
-{
- if (!g_type_is_a(gCustomProtocolRequestType, SOUP_TYPE_REQUEST))
- return;
- soup_session_add_feature_by_type(m_soupSession.get(), gCustomProtocolRequestType);
-}
-
</del><span class="cx"> void SoupNetworkSession::setShouldIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> gIgnoreTLSErrors = ignoreTLSErrors;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (211013 => 211014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-01-21 07:52:20 UTC (rev 211013)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-01-21 09:22:39 UTC (rev 211014)
</span><span class="lines">@@ -32,7 +32,6 @@
</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 size_t GType;
</del><span class="cx"> typedef struct _SoupCache SoupCache;
</span><span class="cx"> typedef struct _SoupCookieJar SoupCookieJar;
</span><span class="cx"> typedef struct _SoupMessage SoupMessage;
</span><span class="lines">@@ -71,9 +70,6 @@
</span><span class="cx"> static void checkTLSErrors(SoupRequest*, SoupMessage*, std::function<void (const ResourceError&)>&&);
</span><span class="cx"> static void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
</span><span class="cx">
</span><del>- static void setCustomProtocolRequestType(GType);
- void setupCustomProtocols();
-
</del><span class="cx"> private:
</span><span class="cx"> void setupLogger();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211013 => 211014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-21 07:52:20 UTC (rev 211013)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-21 09:22:39 UTC (rev 211014)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed, rolling out r211012.
+
+ It caused a lot of crashes in the network process
+
+ Reverted changeset:
+
+ "[SOUP] Custom protocols don't work in private browsing mode"
+ https://bugs.webkit.org/show_bug.cgi?id=167236
+ http://trac.webkit.org/changeset/211012
+
</ins><span class="cx"> 2017-01-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove never changing IndexedDB RuntimeEnabledFeature
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessCustomProtocolssoupCustomProtocolManagerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (211013 => 211014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2017-01-21 07:52:20 UTC (rev 211013)
+++ trunk/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2017-01-21 09:22:39 UTC (rev 211014)
</span><span class="lines">@@ -77,11 +77,6 @@
</span><span class="cx"> void CustomProtocolManager::registerProtocolClass()
</span><span class="cx"> {
</span><span class="cx"> static_cast<WebKitSoupRequestGenericClass*>(g_type_class_ref(WEBKIT_TYPE_SOUP_REQUEST_GENERIC))->client = &CustomProtocolRequestClient::singleton();
</span><del>- SoupNetworkSession::setCustomProtocolRequestType(WEBKIT_TYPE_SOUP_REQUEST_GENERIC);
- NetworkStorageSession::forEach([](const WebCore::NetworkStorageSession& session) {
- if (auto* soupSession = session.soupNetworkSession())
- soupSession->setupCustomProtocols();
- });
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::registerScheme(const String& scheme)
</span><span class="lines">@@ -94,9 +89,9 @@
</span><span class="cx"> g_ptr_array_add(m_registeredSchemes.get(), g_strdup(scheme.utf8().data()));
</span><span class="cx"> g_ptr_array_add(m_registeredSchemes.get(), nullptr);
</span><span class="cx">
</span><del>- auto* genericRequestClass = static_cast<SoupRequestClass*>(g_type_class_peek(WEBKIT_TYPE_SOUP_REQUEST_GENERIC));
- ASSERT(genericRequestClass);
</del><ins>+ auto* genericRequestClass = static_cast<SoupRequestClass*>(g_type_class_ref(WEBKIT_TYPE_SOUP_REQUEST_GENERIC));
</ins><span class="cx"> genericRequestClass->schemes = const_cast<const char**>(reinterpret_cast<char**>(m_registeredSchemes->pdata));
</span><ins>+ soup_session_add_feature_by_type(NetworkStorageSession::defaultStorageSession().getOrCreateSoupNetworkSession().soupSession(), WEBKIT_TYPE_SOUP_REQUEST_GENERIC);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::unregisterScheme(const String&)
</span></span></pre>
</div>
</div>
</body>
</html>