<!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>[185317] 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/185317">185317</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-08 08:59:14 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/185251">r185251</a>): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work when using shared secondary process model after <a href="http://trac.webkit.org/projects/webkit/changeset/185251">r185251</a>
https://bugs.webkit.org/show_bug.cgi?id=145751
Reviewed by Darin Adler.
In <a href="http://trac.webkit.org/projects/webkit/changeset/185251">r185251</a> the CFNetwork cache was disabled in the web process,
but it also removed the disk cache directory web process
initialization parameter. While we support networking in the web
process when shared secondary process model is used, the network
cache should still work. We can remove this if we eventually
switch to use the network process unconditionally.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode): Encode disk cache directory.
(WebKit::WebProcessCreationParameters::decode): Decode disk cache directory.
* Shared/WebProcessCreationParameters.h: Bring back disk cache directory only for soup.
* UIProcess/gtk/WebProcessPoolGtk.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess): Initialize disk cache directory parameter.
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::platformInitializeWebProcess): Use the disck cache directory parameter again.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.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 (185316 => 185317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-08 14:36:47 UTC (rev 185316)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-08 15:59:14 UTC (rev 185317)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-06-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r185251): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work when using shared secondary process model after r185251
+ https://bugs.webkit.org/show_bug.cgi?id=145751
+
+ Reviewed by Darin Adler.
+
+ In r185251 the CFNetwork cache was disabled in the web process,
+ but it also removed the disk cache directory web process
+ initialization parameter. While we support networking in the web
+ process when shared secondary process model is used, the network
+ cache should still work. We can remove this if we eventually
+ switch to use the network process unconditionally.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode): Encode disk cache directory.
+ (WebKit::WebProcessCreationParameters::decode): Decode disk cache directory.
+ * Shared/WebProcessCreationParameters.h: Bring back disk cache directory only for soup.
+ * UIProcess/gtk/WebProcessPoolGtk.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): Initialize disk cache directory parameter.
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess): Use the disck cache directory parameter again.
+
</ins><span class="cx"> 2015-06-08 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the unused scroll function from WebPageGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (185316 => 185317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-06-08 14:36:47 UTC (rev 185316)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-06-08 15:59:14 UTC (rev 185317)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> encoder << urlSchemesRegisteredForCustomProtocols;
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ encoder << diskCacheDirectory;
</ins><span class="cx"> encoder << cookiePersistentStoragePath;
</span><span class="cx"> encoder << cookiePersistentStorageType;
</span><span class="cx"> encoder.encodeEnum(cookieAcceptPolicy);
</span><span class="lines">@@ -217,6 +218,8 @@
</span><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredForCustomProtocols))
</span><span class="cx"> return false;
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ if (!decoder.decode(parameters.diskCacheDirectory))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.cookiePersistentStoragePath))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.cookiePersistentStorageType))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (185316 => 185317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-06-08 14:36:47 UTC (rev 185316)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-06-08 15:59:14 UTC (rev 185317)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> Vector<String> urlSchemesRegisteredForCustomProtocols;
</span><span class="cx"> #if USE(SOUP)
</span><ins>+ String diskCacheDirectory;
</ins><span class="cx"> String cookiePersistentStoragePath;
</span><span class="cx"> uint32_t cookiePersistentStorageType;
</span><span class="cx"> HTTPCookieAcceptPolicy cookieAcceptPolicy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (185316 => 185317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-06-08 14:36:47 UTC (rev 185316)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-06-08 15:59:14 UTC (rev 185317)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx">
</span><ins>+#include "APIProcessPoolConfiguration.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebInspectorServer.h"
</span><span class="lines">@@ -105,6 +106,7 @@
</span><span class="cx"> parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
</span><span class="cx">
</span><span class="cx"> parameters.ignoreTLSErrors = m_ignoreTLSErrors;
</span><ins>+ parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (185316 => 185317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-06-08 14:36:47 UTC (rev 185316)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-06-08 15:59:14 UTC (rev 185317)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "SeccompFiltersWebProcessEfl.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#include "APIProcessPoolConfiguration.h"
</del><span class="cx"> #include "CertificateInfo.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="lines">@@ -136,16 +135,20 @@
</span><span class="cx"> if (usesNetworkProcess())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
</del><ins>+ ASSERT(!parameters.diskCacheDirectory.isEmpty());
</ins><span class="cx">
</span><del>- ASSERT(!configuration->diskCacheDirectory().isEmpty());
-
</del><span class="cx"> // We used to use the given cache directory for the soup cache, but now we use a subdirectory to avoid
</span><span class="cx"> // conflicts with other cache files in the same directory. Remove the old cache files if they still exist.
</span><del>- WebCore::SoupNetworkSession::defaultSession().clearCache(configuration->diskCacheDirectory());
</del><ins>+ WebCore::SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(parameters.diskCacheDirectory));
</ins><span class="cx">
</span><del>- String diskCachePath = WebCore::pathByAppendingComponent(configuration->diskCacheDirectory(), "webkit");
- GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.utf8().data(), SOUP_CACHE_SINGLE_USER));
</del><ins>+#if ENABLE(NETWORK_CACHE)
+ // When network cache is enabled, the disk cache directory is the network process one.
+ CString diskCachePath = WebCore::pathByAppendingComponent(WebCore::directoryName(parameters.diskCacheDirectory), "webkit").utf8();
+#else
+ CString diskCachePath = parameters.diskCacheDirectory.utf8();
+#endif
+
+ GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.data(), SOUP_CACHE_SINGLE_USER));
</ins><span class="cx"> WebCore::SoupNetworkSession::defaultSession().setCache(soupCache.get());
</span><span class="cx"> // Set an initial huge max_size for the SoupCache so the call to soup_cache_load() won't evict any cached
</span><span class="cx"> // resource. The final size of the cache will be set by NetworkProcess::platformSetCacheModel().
</span></span></pre>
</div>
</div>
</body>
</html>