<!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>[185300] 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/185300">185300</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-07 01:48:28 -0700 (Sun, 07 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] Fix build break since <a href="http://trac.webkit.org/projects/webkit/changeset/185262">r185262</a>
https://bugs.webkit.org/show_bug.cgi?id=145724
Unreviewed, fix build break for EFL and GTK ports.
* UIProcess/API/APIWebsiteDataStore.cpp:
(API::WebsiteDataStore::defaultLocalStorageDirectory):
(API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
(API::WebsiteDataStore::defaultNetworkCacheDirectory):
(API::WebsiteDataStore::defaultApplicationCacheDirectory):
(API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
(API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
* UIProcess/efl/WebProcessPoolEfl.cpp:
(WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
(WebKit::WebProcessPool::platformDefaultDiskCacheDirectory): Deleted.
* 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="#trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebProcessPoolEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp</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 (185299 => 185300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/ChangeLog        2015-06-07 08:48:28 UTC (rev 185300)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-07 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL][GTK] Fix build break since r185262
+ https://bugs.webkit.org/show_bug.cgi?id=145724
+
+ Unreviewed, fix build break for EFL and GTK ports.
+
+ * UIProcess/API/APIWebsiteDataStore.cpp:
+ (API::WebsiteDataStore::defaultLocalStorageDirectory):
+ (API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
+ (API::WebsiteDataStore::defaultNetworkCacheDirectory):
+ (API::WebsiteDataStore::defaultApplicationCacheDirectory):
+ (API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
+ (API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
+ * UIProcess/efl/WebProcessPoolEfl.cpp:
+ (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
+ (WebKit::WebProcessPool::platformDefaultDiskCacheDirectory): Deleted.
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2015-06-06 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Don’t enable manual sandboxing in the iOS Simulator. This should fix all the tests timing out.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (185299 => 185300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp        2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp        2015-06-07 08:48:28 UTC (rev 185300)
</span><span class="lines">@@ -80,6 +80,43 @@
</span><span class="cx"> // FIXME: Implement.
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><ins>+
+String WebsiteDataStore::defaultLocalStorageDirectory()
+{
+ // FIXME: Implement.
+ return String();
+}
+
+String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
+{
+ // FIXME: Implement.
+ return String();
+}
+
+String WebsiteDataStore::defaultNetworkCacheDirectory()
+{
+ // FIXME: Implement.
+ return String();
+}
+
+String WebsiteDataStore::defaultApplicationCacheDirectory()
+{
+ // FIXME: Implement.
+ return String();
+}
+
+String WebsiteDataStore::defaultMediaKeysStorageDirectory()
+{
+ // FIXME: Implement.
+ return String();
+}
+
+String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
+{
+ // FIXME: Implement.
+ return String();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (185299 => 185300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp        2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp        2015-06-07 08:48:28 UTC (rev 185300)
</span><span class="lines">@@ -1025,12 +1025,12 @@
</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* context, const char* directory)
</del><ins>+void webkit_web_context_set_disk_cache_directory(WebKitWebContext*, const char* directory)
</ins><span class="cx"> {
</span><del>- g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</del><span class="cx"> g_return_if_fail(directory);
</span><span class="cx">
</span><del>- context->priv->context->setDiskCacheDirectory(WebCore::filenameToString(directory));
</del><ins>+ auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
+ configuration->setDiskCacheDirectory(WebCore::filenameToString(directory));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebProcessPoolEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (185299 => 185300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp        2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp        2015-06-07 08:48:28 UTC (rev 185300)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/MediaKeys";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::platformDefaultDiskCacheDirectory() const
</del><ins>+String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
</ins><span class="cx"> {
</span><span class="cx"> return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (185299 => 185300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp        2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp        2015-06-07 08:48:28 UTC (rev 185300)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> return WebCore::filenameToString(mediaKeysStorageDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::platformDefaultDiskCacheDirectory() const
</del><ins>+String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
</ins><span class="cx"> {
</span><span class="cx"> GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
</span><span class="cx"> return WebCore::filenameToString(diskCacheDirectory.get());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (185299 => 185300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp        2015-06-07 04:42:44 UTC (rev 185299)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp        2015-06-07 08:48:28 UTC (rev 185300)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "SeccompFiltersWebProcessEfl.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#include "APIProcessPoolConfiguration.h"
</ins><span class="cx"> #include "CertificateInfo.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="lines">@@ -135,13 +136,15 @@
</span><span class="cx"> if (usesNetworkProcess())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(!parameters.diskCacheDirectory.isEmpty());
</del><ins>+ auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
</ins><span class="cx">
</span><ins>+ ASSERT(!configuration->diskCacheDirectory().isEmpty());
+
</ins><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(parameters.diskCacheDirectory);
</del><ins>+ WebCore::SoupNetworkSession::defaultSession().clearCache(configuration->diskCacheDirectory());
</ins><span class="cx">
</span><del>- String diskCachePath = WebCore::pathByAppendingComponent(parameters.diskCacheDirectory, "webkit");
</del><ins>+ String diskCachePath = WebCore::pathByAppendingComponent(configuration->diskCacheDirectory(), "webkit");
</ins><span class="cx"> GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.utf8().data(), SOUP_CACHE_SINGLE_USER));
</span><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></pre>
</div>
</div>
</body>
</html>