<!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>[161112] 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/161112">161112</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-28 02:18:06 -0800 (Sat, 28 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][SOUP] Fix handling of cookies when network process is enabled
https://bugs.webkit.org/show_bug.cgi?id=125576
Patch by Kwang Yul Seo <skyul@company100.net> on 2013-12-28
Reviewed by Carlos Garcia Campos.
Initialize the network process with cookie accept policy, persistent
storage path and type. Use
WebContext::sendToNetworkingProcessRelaunchingIfNecessary instead of
WebContext::sendToAllProcessesRelaunchingThemIfNecessary to send
SetCookiePersistentStorage message.
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* UIProcess/soup/WebContextSoup.cpp:
(WebKit::WebContext::platformInitializeNetworkProcess):
* UIProcess/soup/WebCookieManagerProxySoup.cpp:
(WebKit::WebCookieManagerProxy::setCookiePersistentStorage):
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.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="#trunkSourceWebKit2UIProcesssoupWebContextSoupcpp">trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesssoupWebCookieManagerProxySoupcpp">trunk/Source/WebKit2/UIProcess/soup/WebCookieManagerProxySoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-28 Kwang Yul Seo <skyul@company100.net>
+
+ [WK2][SOUP] Fix handling of cookies when network process is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=125576
+
+ Reviewed by Carlos Garcia Campos.
+
+ Initialize the network process with cookie accept policy, persistent
+ storage path and type. Use
+ WebContext::sendToNetworkingProcessRelaunchingIfNecessary instead of
+ WebContext::sendToAllProcessesRelaunchingThemIfNecessary to send
+ SetCookiePersistentStorage message.
+
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * UIProcess/soup/WebContextSoup.cpp:
+ (WebKit::WebContext::platformInitializeNetworkProcess):
+ * UIProcess/soup/WebCookieManagerProxySoup.cpp:
+ (WebKit::WebCookieManagerProxy::setCookiePersistentStorage):
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2013-12-27 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Upstream WebCore/page changes
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CertificateInfo.h"
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx"> #include "ResourceCachesToClear.h"
</span><ins>+#include "WebCookieManager.h"
</ins><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="lines">@@ -80,6 +81,12 @@
</span><span class="cx"> soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
</span><span class="cx"> soup_cache_load(soupCache.get());
</span><span class="cx">
</span><ins>+ if (!parameters.cookiePersistentStoragePath.isEmpty()) {
+ supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
+ parameters.cookiePersistentStorageType);
+ }
+ supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
+
</ins><span class="cx"> setIgnoreTLSErrors(parameters.ignoreTLSErrors);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx"> encoder << httpsProxy;
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ encoder << cookiePersistentStoragePath;
+ encoder << cookiePersistentStorageType;
+ encoder.encodeEnum(cookieAcceptPolicy);
</ins><span class="cx"> encoder << ignoreTLSErrors;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -91,6 +94,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ if (!decoder.decode(result.cookiePersistentStoragePath))
+ return false;
+ if (!decoder.decode(result.cookiePersistentStorageType))
+ return false;
+ if (!decoder.decodeEnum(result.cookieAcceptPolicy))
+ return false;
</ins><span class="cx"> if (!decoder.decode(result.ignoreTLSErrors))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -33,6 +33,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+#include "HTTPCookieAcceptPolicy.h"
+#endif
+
</ins><span class="cx"> namespace CoreIPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="cx"> class ArgumentEncoder;
</span><span class="lines">@@ -69,6 +73,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ String cookiePersistentStoragePath;
+ uint32_t cookiePersistentStorageType;
+ HTTPCookieAcceptPolicy cookieAcceptPolicy;
</ins><span class="cx"> bool ignoreTLSErrors;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesssoupWebContextSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -28,11 +28,14 @@
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><ins>+#include "WebCookieManagerProxy.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><ins>+ supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+ parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
</ins><span class="cx"> parameters.ignoreTLSErrors = m_ignoreTLSErrors;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesssoupWebCookieManagerProxySoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/soup/WebCookieManagerProxySoup.cpp (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/soup/WebCookieManagerProxySoup.cpp 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/UIProcess/soup/WebCookieManagerProxySoup.cpp 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::setCookiePersistentStorage(const String& storagePath, uint32_t storageType)
</span><span class="cx"> {
</span><del>- context()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebCookieManager::SetCookiePersistentStorage(storagePath, storageType));
</del><ins>+ context()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::SetCookiePersistentStorage(storagePath, storageType));
</ins><span class="cx">
</span><span class="cx"> m_cookiePersistentStoragePath = storagePath;
</span><span class="cx"> m_cookiePersistentStorageType = static_cast<SoupCookiePersistentStorageType>(storageType);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (161111 => 161112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-28 10:07:56 UTC (rev 161111)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-28 10:18:06 UTC (rev 161112)
</span><span class="lines">@@ -205,6 +205,12 @@
</span><span class="cx"> GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(parameters.diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
</span><span class="cx"> soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
</span><span class="cx"> soup_cache_load(soupCache.get());
</span><ins>+
+ if (!parameters.cookiePersistentStoragePath.isEmpty()) {
+ supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
+ parameters.cookiePersistentStorageType);
+ }
+ supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
</ins><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -214,12 +220,6 @@
</span><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesRegistered.size(); i++)
</span><span class="cx"> supplement<WebSoupRequestManager>()->registerURIScheme(parameters.urlSchemesRegistered[i]);
</span><span class="cx">
</span><del>- if (!parameters.cookiePersistentStoragePath.isEmpty()) {
- supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
- parameters.cookiePersistentStorageType);
- }
- supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
-
</del><span class="cx"> setIgnoreTLSErrors(parameters.ignoreTLSErrors);
</span><span class="cx">
</span><span class="cx"> WebCore::addLanguageChangeObserver(this, languageChanged);
</span></span></pre>
</div>
</div>
</body>
</html>