<!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>[185311] 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/185311">185311</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-07 23:35:31 -0700 (Sun, 07 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/185262">r185262</a>): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work after <a href="http://trac.webkit.org/projects/webkit/changeset/185262">r185262</a>
https://bugs.webkit.org/show_bug.cgi?id=145735

Reviewed by Darin Adler.

* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformInitializeNetworkProcess): Use
the directory name to clear the old cache, since the disk cache
subdirectory is now added in the UI process.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_set_disk_cache_directory): Update the
WebProcessPool configuration to override the disk cache directory.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess): Use the
configuration to get the disk cache directory.
(WebKit::WebProcessPool::WebProcessPool): Remove
m_diskCacheDirectory member initialization.
* UIProcess/WebProcessPool.h: Remove m_diskCacheDirectory member.
* UIProcess/gtk/WebProcessPoolGtk.cpp:
(WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
Append the disk cache subdirectory.</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="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185310 => 185311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-06-08 02:39:15 UTC (rev 185310)
+++ trunk/Source/WebKit2/ChangeLog        2015-06-08 06:35:31 UTC (rev 185311)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-06-07  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        REGRESSION(r185262): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work after r185262
+        https://bugs.webkit.org/show_bug.cgi?id=145735
+
+        Reviewed by Darin Adler.
+
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcess): Use
+        the directory name to clear the old cache, since the disk cache
+        subdirectory is now added in the UI process.
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkit_web_context_set_disk_cache_directory): Update the
+        WebProcessPool configuration to override the disk cache directory.
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess): Use the
+        configuration to get the disk cache directory.
+        (WebKit::WebProcessPool::WebProcessPool): Remove
+        m_diskCacheDirectory member initialization.
+        * UIProcess/WebProcessPool.h: Remove m_diskCacheDirectory member.
+        * UIProcess/gtk/WebProcessPoolGtk.cpp:
+        (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
+        Append the disk cache subdirectory.
+
</ins><span class="cx"> 2015-06-07  Gyuyoung Kim  &lt;gyuyoung.kim@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL][GTK] Fix build  break since r185262
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (185310 => 185311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp        2015-06-08 02:39:15 UTC (rev 185310)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp        2015-06-08 06:35:31 UTC (rev 185311)
</span><span class="lines">@@ -72,16 +72,15 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">     // Clear the old soup cache if it exists.
</span><del>-    SoupNetworkSession::defaultSession().clearCache(m_diskCacheDirectory);
</del><ins>+    SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(m_diskCacheDirectory));
</ins><span class="cx"> 
</span><span class="cx">     NetworkCache::singleton().initialize(m_diskCacheDirectory, parameters.shouldEnableNetworkCacheEfficacyLogging);
</span><span class="cx"> #else
</span><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>-    SoupNetworkSession::defaultSession().clearCache(parameters.diskCacheDirectory);
</del><ins>+    SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(m_diskCacheDirectory));
</ins><span class="cx"> 
</span><del>-    String diskCachePath = WebCore::pathByAppendingComponent(parameters.diskCacheDirectory, &quot;webkit&quot;);
-    GRefPtr&lt;SoupCache&gt; soupCache = adoptGRef(soup_cache_new(diskCachePath.utf8().data(), SOUP_CACHE_SINGLE_USER));
</del><ins>+    GRefPtr&lt;SoupCache&gt; soupCache = adoptGRef(soup_cache_new(m_diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
</ins><span class="cx">     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>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (185310 => 185311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp        2015-06-08 02:39:15 UTC (rev 185310)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp        2015-06-08 06:35:31 UTC (rev 185311)
</span><span class="lines">@@ -1025,12 +1025,17 @@
</span><span class="cx">  * This method must be called before loading anything in this context, otherwise
</span><span class="cx">  * it will not have any effect.
</span><span class="cx">  */
</span><del>-void webkit_web_context_set_disk_cache_directory(WebKitWebContext*, const char* directory)
</del><ins>+void webkit_web_context_set_disk_cache_directory(WebKitWebContext* context, const char* directory)
</ins><span class="cx"> {
</span><ins>+    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</ins><span class="cx">     g_return_if_fail(directory);
</span><span class="cx"> 
</span><del>-    auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
-    configuration-&gt;setDiskCacheDirectory(WebCore::filenameToString(directory));
</del><ins>+#if ENABLE(NETWORK_CACHE)
+    static const char networkCacheSubdirectory[] = &quot;WebKitCache&quot;;
+#else
+    static const char networkCacheSubdirectory[] = &quot;webkit&quot;;
+#endif
+    context-&gt;priv-&gt;context-&gt;configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::filenameToString(directory), networkCacheSubdirectory));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185310 => 185311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2015-06-08 02:39:15 UTC (rev 185310)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2015-06-08 06:35:31 UTC (rev 185311)
</span><span class="lines">@@ -167,7 +167,6 @@
</span><span class="cx">     , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
</span><span class="cx"> #endif
</span><span class="cx">     , m_applicationCacheDirectory(configuration.applicationCacheDirectory())
</span><del>-    , m_diskCacheDirectory(configuration.diskCacheDirectory())
</del><span class="cx">     , m_indexedDBDatabaseDirectory(configuration.indexedDBDatabaseDirectory())
</span><span class="cx">     , m_mediaKeysStorageDirectory(configuration.mediaKeysStorageDirectory())
</span><span class="cx">     , m_webSQLDatabaseDirectory(configuration.webSQLDatabaseDirectory())
</span><span class="lines">@@ -418,7 +417,7 @@
</span><span class="cx">     parameters.diskCacheSizeOverride = m_diskCacheSizeOverride;
</span><span class="cx">     parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
</span><span class="cx"> 
</span><del>-    parameters.diskCacheDirectory = m_diskCacheDirectory;
</del><ins>+    parameters.diskCacheDirectory = m_configuration-&gt;diskCacheDirectory();
</ins><span class="cx">     if (!parameters.diskCacheDirectory.isEmpty())
</span><span class="cx">         SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (185310 => 185311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h        2015-06-08 02:39:15 UTC (rev 185310)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h        2015-06-08 06:35:31 UTC (rev 185311)
</span><span class="lines">@@ -506,7 +506,6 @@
</span><span class="cx">     String m_overrideCookieStorageDirectory;
</span><span class="cx"> 
</span><span class="cx">     String m_applicationCacheDirectory;
</span><del>-    String m_diskCacheDirectory;
</del><span class="cx">     String m_indexedDBDatabaseDirectory;
</span><span class="cx">     String m_mediaKeysStorageDirectory;
</span><span class="cx">     String m_webSQLDatabaseDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (185310 => 185311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp        2015-06-08 02:39:15 UTC (rev 185310)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp        2015-06-08 06:35:31 UTC (rev 185311)
</span><span class="lines">@@ -144,7 +144,12 @@
</span><span class="cx"> 
</span><span class="cx"> String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
</span><span class="cx"> {
</span><del>-    GUniquePtr&lt;char&gt; diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
</del><ins>+#if ENABLE(NETWORK_CACHE)
+    static const char networkCacheSubdirectory[] = &quot;WebKitCache&quot;;
+#else
+    static const char networkCacheSubdirectory[] = &quot;webkit&quot;;
+#endif
+    GUniquePtr&lt;char&gt; diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), networkCacheSubdirectory, nullptr));
</ins><span class="cx">     return WebCore::filenameToString(diskCacheDirectory.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>